Added navigation, login, and template wrappers