Swap and fix for cleaner css.