Updated main activity layout