fixing evolutions from merge
fix superuser navigation problems