Improved UI. Linked create/edit to image upload