Work on new angular UI