Outsourced tab rendering into separate template
Merge remote-tracking branch 'upstream/master' into development
summon fix