Pre-GUI_controller integration backup
Few changes to GUI layout