CSS cleanup and prepare for new image widths