new templates and views for universe, nav fixes