Prepared the GUI for a new LookAndFeel :D
Code cleanup