Sandbox view reintroduced and some minor fixes