Big changes to lab and user views, also changed route nesting