Mostly Code Improvements

Removed some legacy code, increased name font size, refactored a couple
of class names for clarity.