YH-128: Fixes to navigation and content position