Changed file names and added map page and nav bar