Tune up some classes for better ui