Change toolbars to external toolbar

Fix flickering on page navigation