More moves and merges within Overviews
Merge pull request #402 from KevWright/more-overview-moves

More moves and merges within Overviews