Modular: Gui: use tabbed gui
Modular: Gui: minor improvements