Fixed small bug in Gui - to be addressed with button layout