So much CSS cleanup