Trying hard to improve the GUI