fix styles and page places and nav head
resolve conflicts