Fixed issues with header
fixed issues with spacing