A few changes to GUI
Merged GUI updates