+ more ui changes