Tidy up code
Quick fix for issue with image uploader - still appears below the main content, but is now usable