Lots of code refactoring. Labels changed so that are essentially mappings from an object to a string that can be rendered.