Add headers to popup tabs
Merge remote-tracking branch 'origin/develop' into develop