CODE IS NOW BROKEN -->> AngularUI update to 0.6.0 and other fixes to move forward