Improved classNames - work in progress