Update on UI and minor change on Converter class