Migrated to Angularjs with new ui