Update navigation structure
Update application loading structure