Fixes for image attachment widget