Major refactor

Using angular strap to do the modal and some clean up