Added end activity button and some small layout changes