further css refactor