Minor fixes to map layout