Fixed layout bug on location choosing screen.  Adjusted layout for 3.5" screens as well.