Better image scaling, split out styles