Gui 1208

Contains GUI-1207 as well, so that should be merged first. Then, this PR will give a clearer view of changes to add "delete" features.