feature fix and header styling