Improved navigation, cleaned code