Fixed some style issues with the main layout.

Set the correct views to be set with color