Re-Structure Main View

Add some more flexibility to the main view;