Fixed main viewport space problem. Long main viewports such as Notes still need fixing.
Merge branch 'feature'