Changed main activity layout and manifest