Improved navigation, added icons.