Grade demo redirecting back to context
Changed some names, moved menus around