Image upload bug fixed, editation form reorganized