Streamlined navigation a bit