ui prev commit bug fix
merge with latest commit