Fixed some routing issues and added nav bar