gq2 fixes: Layout and repeated header