Added angular, and started changes for ui