fixed restart bug issue. Still working on fixing the navigation