Cleaning up navigation as reccomended by Russel T Customer