Clean up the views and layout. Easier on the eye