modified navigation and layouts