fix grid layout and nav