Map lists and map view
Fix layout issues