Angel coded logic for views 10,11,12
Merge branch 'Development' of https://github.com/kalemdzievski/NLB into Development