Prettifying The GUI
Merge branch 'prettify-the-gui'