Feature/fix image upload