Made some modifications. Testing out Navigation