Simple Navigation, Some Bugs fixed