Added map, converted layout to percentages