Added map and modified layout