Attempt at improving the GUI