Added map and buttons