Fixing upload image
merge fix
Fixing hotkeys