Tiles and nav cleanup