Fixed UI to work with the json-based protocol