Updated bootstrap, changed view to use new templates, updated nav