change UI and fixed name of value