This commit removes some hardcoded dependencies on CSS classes
and removes unnecessary classes and elements in HTML in this
regard.