Style tweaks
Fix merge conflicts
Style tweaks
Style tweaks
Improve draggability of images
Fix merge conflicts