merged several ui changes