bug #659 - move header to layout