change classes to work better with RWO CSS