Backup UI branch

Backing up UI branch into UI_backup