applied ui changes as discussed
merge branches