Removed the form-wide salt
Better error handling
Added upload in Insert Image popup; some other bugfixes