changed alignment of work images for consistency
fixed merge conflicts