Add HTML functions at end of list/dict, minor refactoring, new app name