some more ui changes
merging the changes