Layout V1

Adjusted layout to make it look better. More adjustments needed. Next
update is improvements to navigation.