updates for improve UI