Enhance pages with tabs refs  #489
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
Enhance pages with tabs refs  #489