fix nav / simplify boxes