Initial rework of UI