diff --git a/www/src/App.tsx b/www/src/App.tsx
index f947de3..d8280dc 100644
--- a/www/src/App.tsx
+++ b/www/src/App.tsx
@@ -79,11 +79,11 @@ export class App extends React.Component<{}, void> {
           <DebugComponent />
         </div>
       </Tab>,
-      <Tab eventKey={9} key="status" title="AWS Status">
-        <div style={{ padding: 10, height: height - 100, overflow: "scroll" }}>
-          <AppStatusComponent />
-        </div>
-      </Tab>,
+//      <Tab eventKey={9} key="status" title="AWS Status">
+//       <div style={{ padding: 10, height: height - 100, overflow: "scroll" }}>
+//        <AppStatusComponent />
+//    </div>
+//    </Tab>,
       <Tab eventKey={10} key="login" title="Login">
         <div style={{ padding: 10 }}>
           <LoginComponent/>
diff --git a/www/src/components/Job.tsx b/www/src/components/Job.tsx
index ce79a2d..831c16a 100644
--- a/www/src/components/Job.tsx
+++ b/www/src/components/Job.tsx
@@ -149,10 +149,10 @@ export class JobComponent extends React.Component<JobProps, {
       if (job.buildOptions) details.push(keyValue("Build", job.buildOptions));
       details.push(keyValue("Codec", job.codec));
       details.push(keyValue("Commit", job.commit));
-      details.push(keyValue("Task", job.task));
+      details.push(keyValue("Set", job.task));
       details.push(keyValue("Qualities", job.qualities));
-      details.push(keyValue("Run A/B Compare", job.runABCompare));
-      details.push(keyValue("Save Encoded Files", job.saveEncodedFiles));
+    //  details.push(keyValue("Run A/B Compare", job.runABCompare));
+    // details.push(keyValue("Save Encoded Files", job.saveEncodedFiles));
       if (job.ctcSets) details.push(keyValue("CTC Sets", JSON.stringify(job.ctcSets)));
       if (job.ctcPresets) details.push(keyValue("CTC Presets", JSON.stringify(job.ctcPresets)));
       if (job.ctcVersion) details.push(keyValue("CTC Version", job.ctcVersion));
diff --git a/www/src/components/Report.tsx b/www/src/components/Report.tsx
index 0bdecda..45e4294 100644
--- a/www/src/components/Report.tsx
+++ b/www/src/components/Report.tsx
@@ -192,6 +192,20 @@ export class AnalyzerLinksComponent extends React.Component<{
     let report = this.props.jobs[0].report;
     let videoRows = [];
     let videos = [];
+    // As the Web analyzer is only made for AV1, check the codec and then
+    // display the analyzer links, so users do not get confused
+    let analyzer_codecs = ['rav1e', 'svt-av1', 'av1'];
+
+    function isCodecMatch(job: Job): boolean {
+      return analyzer_codecs.some(codec => job.codec.includes(codec));
+    }
+
+    let areAllMatches = jobs.every(isCodecMatch);
+    if (areAllMatches == false) {
+      return <Panel header="Analyzer Links">
+        <p>Currently AWCY supports only AV1 for web analyzer</p>
+      </Panel>
+    }
 
     for (let video in report) {
       if (video != "Total") {
diff --git a/www/src/components/SubmitJobForm.tsx b/www/src/components/SubmitJobForm.tsx
index a4032b8..0e0bb0e 100644
--- a/www/src/components/SubmitJobForm.tsx
+++ b/www/src/components/SubmitJobForm.tsx
@@ -320,11 +320,12 @@ export class SubmitJobFormComponent extends React.Component<{
         <FormControl type="text" placeholder="30 40 50 ..."
           value={job.qualities} onChange={this.onInputChange.bind(this, "qualities")} />
       </FormGroup>
-
+      {/*
       <FormGroup validationState={this.getValidationState("arch")}>
         <ControlLabel>Architecture</ControlLabel>
         <Select clearable={false} placeholder="Encoder" value={this.state.arch} options={archOptions} onChange={this.onChangeArch.bind(this)} />
       </FormGroup>
+      */}
 
       <FormGroup validationState={this.getValidationState("ctcSets")}>
         <ControlLabel>This will override the above set (for AOM-CTC)</ControlLabel>