Changes to main activity layout.

Moving to more fragment oriented approach with one activity.