Simplify generation of tabs nav, modify comments accordingly