Little bit of work on GUI
Fixing
Fixing