modify header and refactor menu