More work on main activity layout