Fixed some bugs and improved navigation