Fix up navigation. Clean up toolbar and navbar.