Changes to layout on some activities.
Added activities for Return.
Added click events.