Fix bug that prevented from editing images
Misplaced buttons