Work is mostly done by @alpdeniz in !407 (merged). This MR fixes merge conflicts with the new UI and removes some code duplication.
Work is mostly done by @alpdeniz in !407 (merged). This MR fixes merge conflicts with the new UI and removes some code duplication.