Changed classnames slightly