Removed contact form aside and some tidying up