Image uploads and new navbars

Thanks @berg and @mthurman for the fix of the image uploads!