LOTS of small bug fixes in the layout
UI Cleaning up