Made some layout changes and added map and menu