Updated spacings
Updated spacing to remove conflict
Updated with new modal stuff for image zoom