keeping up with classic; make labels do better & clean up margins of some elements...