CSS architecture cleanup