variations markup / css refactor. #6562