diff --git a/src/app/views/common/monaco/Monaco.tsx b/src/app/views/common/monaco/Monaco.tsx
index 7c68277e4..9d0ab7d72 100644
--- a/src/app/views/common/monaco/Monaco.tsx
+++ b/src/app/views/common/monaco/Monaco.tsx
@@ -72,8 +72,8 @@ const Monaco = ({ body, onChange, language, readOnly, height, extraInfoElement,
           {extraInfoElement}
           <Editor
             language={language || 'json'}
-            width=' 100%'
-            height=' 100%'
+            width='100%'
+            height='100%'
             value={formattedBody}
             options={editorOptions}
             onChange={onChange}
diff --git a/src/app/views/query-response/pivot-items/pivot-item.tsx b/src/app/views/query-response/pivot-items/pivot-item.tsx
index b52177efe..7542dd6e0 100644
--- a/src/app/views/query-response/pivot-items/pivot-item.tsx
+++ b/src/app/views/query-response/pivot-items/pivot-item.tsx
@@ -63,7 +63,7 @@ const useStyles = makeStyles({
     backgroundColor: tokens.colorNeutralBackground1,
     height: '100%',
     minHeight: '600px',
-    overflow: 'auto'
+    overflow: 'hidden'
   }
 });
 
diff --git a/src/app/views/query-response/snippets/Snippets.tsx b/src/app/views/query-response/snippets/Snippets.tsx
index 4efb50bf4..065323028 100644
--- a/src/app/views/query-response/snippets/Snippets.tsx
+++ b/src/app/views/query-response/snippets/Snippets.tsx
@@ -65,8 +65,10 @@ const supportedLanguages: LanguageSnippet = {
 const useSnippetStyles = makeStyles({
   container: {
     margin: '0 auto',
+    paddingTop: '5px',
+    paddingLeft: '5px',
     maxHeight: '100vh',
-    overflowY: 'auto',
+    overflowY: 'hidden',
     display: 'flex',
     flexDirection: 'column'
   },
@@ -78,8 +80,7 @@ const useSnippetStyles = makeStyles({
     display: 'flex',
     flexDirection: 'column',
     flex: '1 1 auto',
-    height: '30vh',
-    overflowY: 'auto'
+    height: '60vh'
   },
   copyButton: {
     marginLeft: 'auto'
@@ -87,7 +88,7 @@ const useSnippetStyles = makeStyles({
   snippetContent: {
     display: 'flex',
     flexDirection: 'column',
-    overflowY: 'auto',
+    overflowY: 'hidden',
     maxHeight: 'calc(100vh-120px)'
   }
 });
@@ -201,11 +202,14 @@ const RenderSnippets = () => {
   return (
     <div id='snippets-tablist' className={styles.container}>
       <TabList selectedValue={selectedLanguage} onTabSelect={onTabSelect}>
-        {Object.keys(supportedLanguages).map((language: string) => (
-          <Tab key={language} value={language}>
-            {language === 'CSharp' ? 'C#' : language}
-          </Tab>
-        ))}
+        <Tab key='CSharp' value='CSharp'>C#</Tab>
+        {/*The rest should be sorted in alphabetical order to match docs */}
+        {Object.keys(supportedLanguages)
+          .filter(lang => lang !== 'CSharp')
+          .sort((a, b) => a.localeCompare(b))
+          .map(language => (
+            <Tab key={language} value={language}>{language}</Tab>
+          ))}
       </TabList>
       <div id='snippet-content'>
         <SnippetContent language={selectedLanguage as string} />