refactor, using new angular and bootstrap