UI update

if have time, need to clean up code
UI Update