Added structure for nav and body