Changes GUI
Merge branch 'GUI_Development'