Changes to layout and activity