hotfixes
Merge branch 'feature/hotfixes'
Hotfixes
fixed edit image