Few ui changes