More work on the GUI + button system