Updated layouts for contact, neighbourhood and general tweaks