Refactored classnames to defaults to make layout fixes simpler