Refactor of view controllers in preparation for saved pages. WILL AMEND.

Change-Id: I58ad546b41bb4c87fa073fe78e297dab8eff33e5