Further Changes on UI