Continued upgrade to Angular UI 3 Grid

Continued upgrade to Angular UI 3 Grid