Update angular, refactor menu