Improve navigation and scaling