Added dictionary support.
Updated UI
Updated UI to more accurate strings.