GPS and layout tweaks