Fixed bugs in design of header