css refactor and cleanup