Cleaned the navigation package, allowing easier usage/modification