Merging development up to staging

Including a fix for the bad iframes on small screens