Switch dropdown to use ng directive for bootstrap
Rearrange code controls for clarity