Map now working, still some funky things with navigation