Small Improvements - GUI

GUI is a little cleaner, better spaced.