updated todo
fixes and added TbModal
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add nav helpers