diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3b56dc..58e9dc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ _Can be run using `npm run codetotal:beta`_
   - Add missing icon for Java
   - Show language only if it's available
   - Detect language for file analysis
+  - Change score to risk
+  - Remove auto focus from analysis tabs
+  - Add auto focus to snippet & repo inputs
+  - Highlight resource type in report header
 - Back-End
   - Bug fix: SBOM packages not showing up in report page. Async parsing of packages information in SBOM module
 
diff --git a/packages/app/src/analysis/components/AnalysisInputForm.tsx b/packages/app/src/analysis/components/AnalysisInputForm.tsx
index ee52efd..19afa01 100644
--- a/packages/app/src/analysis/components/AnalysisInputForm.tsx
+++ b/packages/app/src/analysis/components/AnalysisInputForm.tsx
@@ -38,7 +38,6 @@ export const AnalysisInputForm: FC<AnalysisInputFormProps> = ({
           variant="fullWidth"
         >
           <Tab
-            autoFocus
             label="Code Snippet"
             value={AnalysisType.Snippet}
             className={classes.tab}
diff --git a/packages/app/src/analysis/components/CodeSnippetForm.tsx b/packages/app/src/analysis/components/CodeSnippetForm.tsx
index a42b900..13e337f 100644
--- a/packages/app/src/analysis/components/CodeSnippetForm.tsx
+++ b/packages/app/src/analysis/components/CodeSnippetForm.tsx
@@ -29,6 +29,7 @@ export const CodeSnippetForm: FC<AnalysisFormProps> = ({ onSubmit }) => {
   return (
     <div className={classes.codeSnippetForm}>
       <TextField
+        autoFocus
         rows={5}
         multiline
         fullWidth
diff --git a/packages/app/src/analysis/components/RepositoryForm.tsx b/packages/app/src/analysis/components/RepositoryForm.tsx
index 321f232..d20fc7b 100644
--- a/packages/app/src/analysis/components/RepositoryForm.tsx
+++ b/packages/app/src/analysis/components/RepositoryForm.tsx
@@ -17,6 +17,7 @@ export const RepositoryForm: FC<AnalysisFormProps> = ({ onSubmit }) => {
     <div className={classes.repositoryForm}>
       <FormControl fullWidth>
         <TextField
+          autoFocus
           placeholder="Enter Repository URL"
           value={repositoryURL}
           onChange={handleChange}
diff --git a/packages/app/src/report/components/header/ReportHeader.tsx b/packages/app/src/report/components/header/ReportHeader.tsx
index 584a665..dc2b8bf 100644
--- a/packages/app/src/report/components/header/ReportHeader.tsx
+++ b/packages/app/src/report/components/header/ReportHeader.tsx
@@ -49,11 +49,23 @@ export const ReportHeader: FC<ReportBannerProps> = ({ ready }) => {
           style={{ color }}
           data-cy="report-header"
         >
-          {linters.length === 0 && <>Scanning {resourceType}...</>}
+          {linters.length === 0 && (
+            <>
+              Scanning
+              <span className={classes.resourceTypeText}>
+                &nbsp;{resourceType}&nbsp;
+              </span>
+              ...
+            </>
+          )}
           {linters.length > 0 && (
             <>
               {lintersWithIssuesCount} / {linters.length} security linters
-              flagged this&nbsp;{resourceType} to have security issues
+              flagged this
+              <span className={classes.resourceTypeText}>
+                &nbsp;{resourceType}&nbsp;
+              </span>
+              to have security issues
             </>
           )}
         </Typography>
@@ -155,6 +167,9 @@ const useStyles = makeStyles()((theme: Theme) => ({
     maxWidth: 600,
     whiteSpace: "nowrap",
   },
+  resourceTypeText: {
+    fontWeight: 300,
+  },
 }));
 
 interface ReportBannerProps {
diff --git a/packages/app/src/report/components/header/Score.tsx b/packages/app/src/report/components/header/Score.tsx
index 4387640..7ce0252 100644
--- a/packages/app/src/report/components/header/Score.tsx
+++ b/packages/app/src/report/components/header/Score.tsx
@@ -73,7 +73,7 @@ export const Score: FC<ScoreProps> = ({
               color="text.secondary"
               className={classes.label}
             >
-              Score
+              Risk
             </Typography>
           </div>
         )}
@@ -101,7 +101,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
   },
   countUp: {
     fontSize: 20,
-    [theme.breakpoints.up("sm")]: {
+    [theme.breakpoints.up("md")]: {
       fontSize: 35,
     },
     fontWeight: 700,