diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
index bca369e87..0c0c965a1 100644
--- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
@@ -21,6 +21,7 @@ import ResponsivePaneContent from '../ResponsivePane/ResponsivePaneContent'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { StreamingFileReader } from '@standardnotes/filepicker'
+import { classNames } from '@/Utils/ConcatenateClassNames'
 
 type Props = {
   accountMenuController: AccountMenuController
@@ -179,7 +180,10 @@ const ContentListView: FunctionComponent<Props> = ({
   return (
     <div
       id="items-column"
-      className="sn-component section app-column flex flex-col border-b border-solid border-border xl:w-87.5 xsm-only:!w-full sm-only:!w-full md-only:!w-52 lg-only:!w-52"
+      className={classNames(
+        'sn-component section app-column flex flex-col border-b border-solid border-border ',
+        'xl:w-87.5 xsm-only:!w-full sm-only:!w-full md-only:!w-52 lg-only:!w-52',
+      )}
       aria-label={'Notes & Files'}
       ref={itemsViewPanelRef}
     >
diff --git a/packages/web/src/javascripts/Components/Navigation/Navigation.tsx b/packages/web/src/javascripts/Components/Navigation/Navigation.tsx
index 766bab154..ddef9a198 100644
--- a/packages/web/src/javascripts/Components/Navigation/Navigation.tsx
+++ b/packages/web/src/javascripts/Components/Navigation/Navigation.tsx
@@ -10,7 +10,6 @@ import SearchBar from '@/Components/SearchBar/SearchBar'
 import ResponsivePaneContent from '@/Components/ResponsivePane/ResponsivePaneContent'
 import { AppPaneId } from '@/Components/ResponsivePane/AppPaneMetadata'
 import { classNames } from '@/Utils/ConcatenateClassNames'
-import Icon from '@/Components/Icon/Icon'
 
 type Props = {
   application: WebApplication
@@ -20,7 +19,6 @@ const Navigation: FunctionComponent<Props> = ({ application }) => {
   const viewControllerManager = useMemo(() => application.getViewControllerManager(), [application])
   const ref = useRef<HTMLDivElement>(null)
   const [panelWidth, setPanelWidth] = useState<number>(0)
-  const [isPanelExpanded, setIsPanelExpanded] = useState(true)
 
   useEffect(() => {
     const removeObserver = application.addEventObserver(async () => {
@@ -51,37 +49,21 @@ const Navigation: FunctionComponent<Props> = ({ application }) => {
   return (
     <div
       id="navigation"
-      className={classNames(
-        'sn-component section app-column xl:w-[220px] xsm-only:!w-full sm-only:!w-full md-only:transition-width lg-only:transition-width',
-        isPanelExpanded ? 'md-only:!w-[220px] lg-only:!w-[220px]' : 'md-only:!w-18 lg-only:!w-18',
-      )}
+      className={'sn-component section app-column w-[220px] xsm-only:!w-full sm-only:!w-full'}
       ref={ref}
     >
       <ResponsivePaneContent paneId={AppPaneId.Navigation} contentElementId="navigation-content">
-        {isPanelExpanded && (
-          <SearchBar
-            itemListController={viewControllerManager.itemListController}
-            searchOptionsController={viewControllerManager.searchOptionsController}
-            selectedViewTitle={viewControllerManager.navigationController.selected?.title}
-          />
-        )}
-        <div className={'flex justify-end'}>
-          <div className={classNames('section-title-bar block w-full xl:block', !isPanelExpanded && 'hidden')}>
-            <div className="section-title-bar-header">
-              <div className="title text-sm">
-                <span className="font-bold">Views</span>
-              </div>
+        <SearchBar
+          itemListController={viewControllerManager.itemListController}
+          searchOptionsController={viewControllerManager.searchOptionsController}
+          selectedViewTitle={viewControllerManager.navigationController.selected?.title}
+        />
+        <div className={'section-title-bar'}>
+          <div className="section-title-bar-header">
+            <div className="title text-sm">
+              <span className="font-bold">Views</span>
             </div>
           </div>
-          <div
-            className={classNames(
-              'hidden items-end self-end rounded-full rounded-tr-none rounded-br-none bg-default p-1 text-foreground md:flex xl:hidden',
-              isPanelExpanded ? 'mb-1 w-fit' : 'mt-4.5 mb-3 ml-3 w-full',
-            )}
-            onClick={() => setIsPanelExpanded(!isPanelExpanded)}
-          >
-            <Icon type="chevron-down" className={isPanelExpanded ? 'rotate-90' : '-rotate-90'} />
-          </div>
         </div>
         <div
           className={classNames(
@@ -90,8 +72,8 @@ const Navigation: FunctionComponent<Props> = ({ application }) => {
             'md:hover:[overflow-y:_overlay]',
           )}
         >
-          <SmartViewsSection viewControllerManager={viewControllerManager} isCollapsed={!isPanelExpanded} />
-          <TagsSection viewControllerManager={viewControllerManager} isCollapsed={!isPanelExpanded} />
+          <SmartViewsSection viewControllerManager={viewControllerManager} />
+          <TagsSection viewControllerManager={viewControllerManager} />
         </div>
       </ResponsivePaneContent>
       {ref.current && (
diff --git a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
index fa6e3f0c4..935c32c5d 100644
--- a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
@@ -36,6 +36,7 @@ import {
 import { reloadFont } from './FontFunctions'
 import { NoteViewProps } from './NoteViewProps'
 import IndicatorCircle from '../IndicatorCircle/IndicatorCircle'
+import { classNames } from '@/Utils/ConcatenateClassNames'
 
 const MINIMUM_STATUS_DURATION = 400
 const TEXTAREA_DEBOUNCE = 100
@@ -911,7 +912,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
 
           {this.note && (
             <div id="editor-title-bar" className="content-title-bar section-title-bar z-editor-title-bar w-full">
-              <div className="mb-2 flex flex-wrap items-center justify-between gap-2 md:mb-0 md:flex-nowrap md:gap-0">
+              <div className="mb-2 flex flex-wrap items-start justify-between gap-2 md:mb-0 md:flex-nowrap md:gap-0 xl:items-center">
                 <div className={(this.state.noteLocked ? 'locked' : '') + ' flex-grow'}>
                   <div className="title overflow-auto">
                     <input
@@ -929,9 +930,14 @@ class NoteView extends PureComponent<NoteViewProps, State> {
                     />
                   </div>
                 </div>
-                <div className="flex flex-col flex-wrap items-start gap-3 md:flex-row md:flex-nowrap md:items-center">
+                <div
+                  className={classNames(
+                    'flex flex-col flex-wrap items-start gap-3 md:flex-col-reverse md:items-end',
+                    'xl:flex-row xl:flex-nowrap xl:items-center',
+                  )}
+                >
                   {this.state.noteStatus?.message?.length && (
-                    <div id="save-status-container">
+                    <div id="save-status-container" className={'xl:mr-5 xl:max-w-[16ch]'}>
                       <div id="save-status">
                         <div
                           className={
diff --git a/packages/web/src/javascripts/Components/Tags/SmartViewsList.tsx b/packages/web/src/javascripts/Components/Tags/SmartViewsList.tsx
index 7b9daf56f..71454537f 100644
--- a/packages/web/src/javascripts/Components/Tags/SmartViewsList.tsx
+++ b/packages/web/src/javascripts/Components/Tags/SmartViewsList.tsx
@@ -5,10 +5,9 @@ import SmartViewsListItem from './SmartViewsListItem'
 
 type Props = {
   viewControllerManager: ViewControllerManager
-  isCollapsed: boolean
 }
 
-const SmartViewsList: FunctionComponent<Props> = ({ viewControllerManager, isCollapsed }: Props) => {
+const SmartViewsList: FunctionComponent<Props> = ({ viewControllerManager }: Props) => {
   const allViews = viewControllerManager.navigationController.smartViews
 
   return (
@@ -20,7 +19,6 @@ const SmartViewsList: FunctionComponent<Props> = ({ viewControllerManager, isCol
             view={view}
             tagsState={viewControllerManager.navigationController}
             features={viewControllerManager.featuresController}
-            isCollapsed={isCollapsed}
           />
         )
       })}
diff --git a/packages/web/src/javascripts/Components/Tags/SmartViewsListItem.tsx b/packages/web/src/javascripts/Components/Tags/SmartViewsListItem.tsx
index 263c265cd..126971bd7 100644
--- a/packages/web/src/javascripts/Components/Tags/SmartViewsListItem.tsx
+++ b/packages/web/src/javascripts/Components/Tags/SmartViewsListItem.tsx
@@ -21,7 +21,6 @@ type Props = {
   view: SmartView
   tagsState: NavigationController
   features: FeaturesController
-  isCollapsed: boolean
 }
 
 const PADDING_BASE_PX = 14
@@ -47,7 +46,7 @@ const smartViewIconType = (view: SmartView, isSelected: boolean): IconType => {
   return 'hashtag'
 }
 
-const SmartViewsListItem: FunctionComponent<Props> = ({ view, tagsState, isCollapsed }) => {
+const SmartViewsListItem: FunctionComponent<Props> = ({ view, tagsState }) => {
   const { toggleAppPane } = useResponsiveAppPane()
 
   const [title, setTitle] = useState(view.title || '')
@@ -113,31 +112,19 @@ const SmartViewsListItem: FunctionComponent<Props> = ({ view, tagsState, isColla
   return (
     <>
       <div
-        className={classNames(
-          'tag',
-          isSelected && 'selected',
-          isFaded && 'opacity-50',
-          isCollapsed && '!bg-transparent',
-        )}
+        className={classNames('tag', isSelected && 'selected', isFaded && 'opacity-50')}
         onClick={selectCurrentTag}
         style={{
           paddingLeft: `${level * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`,
         }}
       >
-        <div className="tag-info relative">
-          <div
-            className={classNames(
-              isCollapsed
-                ? `relative flex h-[40px] w-[40px] items-center justify-center
-                  ${isSelected ? 'transparent-info-color-background' : 'transparent-info-color-background-hover'}`
-                : 'tag-icon mr-2',
-            )}
-          >
+        <div className="tag-info">
+          <div className={'tag-icon mr-2'}>
             <Icon type={iconType} className={isSelected ? 'text-info' : 'text-neutral'} />
           </div>
           {isEditing ? (
             <input
-              className={classNames('title editing', isCollapsed ? 'hidden' : 'block')}
+              className={'title editing'}
               id={`react-tag-${view.uuid}`}
               onBlur={onBlur}
               onInput={onInput}
@@ -147,19 +134,14 @@ const SmartViewsListItem: FunctionComponent<Props> = ({ view, tagsState, isColla
               ref={inputRef}
             />
           ) : (
-            <div
-              className={classNames('title overflow-hidden text-left', isCollapsed ? 'hidden' : 'block')}
-              id={`react-tag-${view.uuid}`}
-            >
+            <div className={'title overflow-hidden text-left'} id={`react-tag-${view.uuid}`}>
               {title}
             </div>
           )}
-          <div className={classNames('count', isCollapsed ? 'absolute top-0 right-0' : '')}>
-            {view.uuid === SystemViewId.AllNotes && tagsState.allNotesCount}
-          </div>
+          <div className={'count'}>{view.uuid === SystemViewId.AllNotes && tagsState.allNotesCount}</div>
         </div>
 
-        {!isSystemView(view) && !isCollapsed && (
+        {!isSystemView(view) && (
           <div className="meta">
             {view.conflictOf && (
               <div className="danger text-[0.625rem] font-bold">Conflicted Copy {view.conflictOf}</div>
diff --git a/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx b/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx
index d33fa6e3e..f2f48399b 100644
--- a/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx
+++ b/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx
@@ -5,13 +5,12 @@ import SmartViewsList from './SmartViewsList'
 
 type Props = {
   viewControllerManager: ViewControllerManager
-  isCollapsed: boolean
 }
 
-const SmartViewsSection: FunctionComponent<Props> = ({ viewControllerManager, isCollapsed }) => {
+const SmartViewsSection: FunctionComponent<Props> = ({ viewControllerManager }) => {
   return (
     <section>
-      <SmartViewsList viewControllerManager={viewControllerManager} isCollapsed={isCollapsed} />
+      <SmartViewsList viewControllerManager={viewControllerManager} />
     </section>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Tags/TagsList.tsx b/packages/web/src/javascripts/Components/Tags/TagsList.tsx
index f1ef19187..74e72159f 100644
--- a/packages/web/src/javascripts/Components/Tags/TagsList.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagsList.tsx
@@ -9,10 +9,9 @@ import { TagsListItem } from './TagsListItem'
 
 type Props = {
   viewControllerManager: ViewControllerManager
-  isCollapsed: boolean
 }
 
-const TagsList: FunctionComponent<Props> = ({ viewControllerManager, isCollapsed }: Props) => {
+const TagsList: FunctionComponent<Props> = ({ viewControllerManager }: Props) => {
   const tagsState = viewControllerManager.navigationController
   const allTags = tagsState.allLocalRootTags
 
@@ -53,7 +52,6 @@ const TagsList: FunctionComponent<Props> = ({ viewControllerManager, isCollapsed
                 tagsState={tagsState}
                 features={viewControllerManager.featuresController}
                 onContextMenu={onContextMenu}
-                isCollapsed={isCollapsed}
               />
             )
           })}
diff --git a/packages/web/src/javascripts/Components/Tags/TagsListItem.tsx b/packages/web/src/javascripts/Components/Tags/TagsListItem.tsx
index fdf966e53..10087df59 100644
--- a/packages/web/src/javascripts/Components/Tags/TagsListItem.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagsListItem.tsx
@@ -22,7 +22,6 @@ import { useDrag, useDrop } from 'react-dnd'
 import { DropItem, DropProps, ItemTypes } from './DragNDrop'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
-import { classNames } from '@/Utils/ConcatenateClassNames'
 
 type Props = {
   tag: SNTag
@@ -30,306 +29,287 @@ type Props = {
   features: FeaturesController
   level: number
   onContextMenu: (tag: SNTag, posX: number, posY: number) => void
-  isCollapsed: boolean
 }
 
 const PADDING_BASE_PX = 14
-const PADDING_BASE_WHEN_COLLAPSED_PX = 6
 const PADDING_PER_LEVEL_PX = 21
-const PADDING_PER_LEVEL_WHEN_COLLAPSED_PX = 10
 
-export const TagsListItem: FunctionComponent<Props> = observer(
-  ({ tag, features, tagsState, level, onContextMenu, isCollapsed }) => {
-    const { toggleAppPane } = useResponsiveAppPane()
+export const TagsListItem: FunctionComponent<Props> = observer(({ tag, features, tagsState, level, onContextMenu }) => {
+  const { toggleAppPane } = useResponsiveAppPane()
 
-    const [title, setTitle] = useState(tag.title || '')
-    const [subtagTitle, setSubtagTitle] = useState('')
-    const inputRef = useRef<HTMLInputElement>(null)
-    const subtagInputRef = useRef<HTMLInputElement>(null)
-    const menuButtonRef = useRef<HTMLAnchorElement>(null)
+  const [title, setTitle] = useState(tag.title || '')
+  const [subtagTitle, setSubtagTitle] = useState('')
+  const inputRef = useRef<HTMLInputElement>(null)
+  const subtagInputRef = useRef<HTMLInputElement>(null)
+  const menuButtonRef = useRef<HTMLAnchorElement>(null)
 
-    const isSelected = tagsState.selected === tag
-    const isEditing = tagsState.editingTag === tag
-    const isAddingSubtag = tagsState.addingSubtagTo === tag
-    const noteCounts = computed(() => tagsState.getNotesCount(tag))
+  const isSelected = tagsState.selected === tag
+  const isEditing = tagsState.editingTag === tag
+  const isAddingSubtag = tagsState.addingSubtagTo === tag
+  const noteCounts = computed(() => tagsState.getNotesCount(tag))
 
-    const childrenTags = computed(() => tagsState.getChildren(tag)).get()
-    const hasChildren = childrenTags.length > 0
+  const childrenTags = computed(() => tagsState.getChildren(tag)).get()
+  const hasChildren = childrenTags.length > 0
 
-    const hasFolders = features.hasFolders
-    const hasAtLeastOneFolder = tagsState.hasAtLeastOneFolder
+  const hasFolders = features.hasFolders
+  const hasAtLeastOneFolder = tagsState.hasAtLeastOneFolder
 
-    const premiumModal = usePremiumModal()
+  const premiumModal = usePremiumModal()
 
-    const [showChildren, setShowChildren] = useState(tag.expanded)
-    const [hadChildren, setHadChildren] = useState(hasChildren)
+  const [showChildren, setShowChildren] = useState(tag.expanded)
+  const [hadChildren, setHadChildren] = useState(hasChildren)
 
-    useEffect(() => {
-      if (!hadChildren && hasChildren) {
-        setShowChildren(true)
-      }
-      setHadChildren(hasChildren)
-    }, [hadChildren, hasChildren])
+  useEffect(() => {
+    if (!hadChildren && hasChildren) {
+      setShowChildren(true)
+    }
+    setHadChildren(hasChildren)
+  }, [hadChildren, hasChildren])
 
-    useEffect(() => {
-      setTitle(tag.title || '')
-    }, [setTitle, tag])
+  useEffect(() => {
+    setTitle(tag.title || '')
+  }, [setTitle, tag])
 
-    const toggleChildren: MouseEventHandler = useCallback(
-      (e) => {
-        e.stopPropagation()
-        setShowChildren((x) => {
-          tagsState.setExpanded(tag, !x)
-          return !x
-        })
-      },
-      [setShowChildren, tag, tagsState],
-    )
+  const toggleChildren: MouseEventHandler = useCallback(
+    (e) => {
+      e.stopPropagation()
+      setShowChildren((x) => {
+        tagsState.setExpanded(tag, !x)
+        return !x
+      })
+    },
+    [setShowChildren, tag, tagsState],
+  )
 
-    const selectCurrentTag = useCallback(async () => {
-      await tagsState.setSelectedTag(tag)
-      toggleAppPane(AppPaneId.Items)
-    }, [tagsState, tag, toggleAppPane])
+  const selectCurrentTag = useCallback(async () => {
+    await tagsState.setSelectedTag(tag)
+    toggleAppPane(AppPaneId.Items)
+  }, [tagsState, tag, toggleAppPane])
 
-    const onBlur = useCallback(() => {
-      tagsState.save(tag, title).catch(console.error)
-      setTitle(tag.title)
-    }, [tagsState, tag, title, setTitle])
+  const onBlur = useCallback(() => {
+    tagsState.save(tag, title).catch(console.error)
+    setTitle(tag.title)
+  }, [tagsState, tag, title, setTitle])
 
-    const onInput: FormEventHandler = useCallback(
-      (e) => {
-        const value = (e.target as HTMLInputElement).value
-        setTitle(value)
-      },
-      [setTitle],
-    )
-
-    const onKeyDown: KeyboardEventHandler = useCallback(
-      (e) => {
-        if (e.key === KeyboardKey.Enter) {
-          inputRef.current?.blur()
-          e.preventDefault()
-        }
-      },
-      [inputRef],
-    )
-
-    useEffect(() => {
-      if (isEditing) {
-        inputRef.current?.focus()
-      }
-    }, [inputRef, isEditing])
-
-    const onSubtagInput = useCallback((e) => {
+  const onInput: FormEventHandler = useCallback(
+    (e) => {
       const value = (e.target as HTMLInputElement).value
-      setSubtagTitle(value)
-    }, [])
+      setTitle(value)
+    },
+    [setTitle],
+  )
 
-    const onSubtagInputBlur = useCallback(() => {
-      tagsState.createSubtagAndAssignParent(tag, subtagTitle).catch(console.error)
-      setSubtagTitle('')
-    }, [subtagTitle, tag, tagsState])
-
-    const onSubtagKeyDown: KeyboardEventHandler = useCallback(
-      (e) => {
-        if (e.key === KeyboardKey.Enter) {
-          e.preventDefault()
-          subtagInputRef.current?.blur()
-        }
-      },
-      [subtagInputRef],
-    )
-
-    useEffect(() => {
-      if (isAddingSubtag) {
-        subtagInputRef.current?.focus()
+  const onKeyDown: KeyboardEventHandler = useCallback(
+    (e) => {
+      if (e.key === KeyboardKey.Enter) {
+        inputRef.current?.blur()
+        e.preventDefault()
       }
-    }, [subtagInputRef, isAddingSubtag])
+    },
+    [inputRef],
+  )
 
-    const [, dragRef] = useDrag(
-      () => ({
-        type: ItemTypes.TAG,
-        item: { uuid: tag.uuid },
-        canDrag: () => {
-          return true
-        },
-        collect: (monitor) => ({
-          isDragging: !!monitor.isDragging(),
-        }),
+  useEffect(() => {
+    if (isEditing) {
+      inputRef.current?.focus()
+    }
+  }, [inputRef, isEditing])
+
+  const onSubtagInput = useCallback((e) => {
+    const value = (e.target as HTMLInputElement).value
+    setSubtagTitle(value)
+  }, [])
+
+  const onSubtagInputBlur = useCallback(() => {
+    tagsState.createSubtagAndAssignParent(tag, subtagTitle).catch(console.error)
+    setSubtagTitle('')
+  }, [subtagTitle, tag, tagsState])
+
+  const onSubtagKeyDown: KeyboardEventHandler = useCallback(
+    (e) => {
+      if (e.key === KeyboardKey.Enter) {
+        e.preventDefault()
+        subtagInputRef.current?.blur()
+      }
+    },
+    [subtagInputRef],
+  )
+
+  useEffect(() => {
+    if (isAddingSubtag) {
+      subtagInputRef.current?.focus()
+    }
+  }, [subtagInputRef, isAddingSubtag])
+
+  const [, dragRef] = useDrag(
+    () => ({
+      type: ItemTypes.TAG,
+      item: { uuid: tag.uuid },
+      canDrag: () => {
+        return true
+      },
+      collect: (monitor) => ({
+        isDragging: !!monitor.isDragging(),
       }),
-      [tag],
-    )
+    }),
+    [tag],
+  )
 
-    const [{ isOver, canDrop }, dropRef] = useDrop<DropItem, void, DropProps>(
-      () => ({
-        accept: ItemTypes.TAG,
-        canDrop: (item) => {
-          return tagsState.isValidTagParent(tag, item as SNTag)
-        },
-        drop: (item) => {
-          if (!hasFolders) {
-            premiumModal.activate(TAG_FOLDERS_FEATURE_NAME)
-            return
-          }
-          tagsState.assignParent(item.uuid, tag.uuid).catch(console.error)
-        },
-        collect: (monitor) => ({
-          isOver: !!monitor.isOver(),
-          canDrop: !!monitor.canDrop(),
-        }),
-      }),
-      [tag, tagsState, hasFolders, premiumModal],
-    )
-
-    const readyToDrop = isOver && canDrop
-
-    const toggleContextMenu: MouseEventHandler<HTMLAnchorElement> = useCallback(
-      (event) => {
-        event.preventDefault()
-        event.stopPropagation()
-
-        if (!menuButtonRef.current) {
+  const [{ isOver, canDrop }, dropRef] = useDrop<DropItem, void, DropProps>(
+    () => ({
+      accept: ItemTypes.TAG,
+      canDrop: (item) => {
+        return tagsState.isValidTagParent(tag, item as SNTag)
+      },
+      drop: (item) => {
+        if (!hasFolders) {
+          premiumModal.activate(TAG_FOLDERS_FEATURE_NAME)
           return
         }
-
-        const contextMenuOpen = tagsState.contextMenuOpen
-        const menuButtonRect = menuButtonRef.current?.getBoundingClientRect()
-
-        if (contextMenuOpen) {
-          tagsState.setContextMenuOpen(false)
-        } else {
-          onContextMenu(tag, menuButtonRect.right, menuButtonRect.top)
-        }
+        tagsState.assignParent(item.uuid, tag.uuid).catch(console.error)
       },
-      [onContextMenu, tagsState, tag],
-    )
+      collect: (monitor) => ({
+        isOver: !!monitor.isOver(),
+        canDrop: !!monitor.canDrop(),
+      }),
+    }),
+    [tag, tagsState, hasFolders, premiumModal],
+  )
 
-    return (
-      <>
-        <button
-          className={`tag focus:shadow-inner ${isSelected ? 'selected' : ''} ${readyToDrop ? 'is-drag-over' : ''}`}
-          onClick={selectCurrentTag}
-          ref={dragRef}
-          style={{
-            paddingLeft: `${
-              isCollapsed
-                ? level * PADDING_PER_LEVEL_WHEN_COLLAPSED_PX + PADDING_BASE_WHEN_COLLAPSED_PX
-                : level * PADDING_PER_LEVEL_PX + PADDING_BASE_PX
-            }px`,
-          }}
-          onContextMenu={(e) => {
-            e.preventDefault()
-            onContextMenu(tag, e.clientX, e.clientY)
-          }}
-        >
-          <div className="tag-info" title={title} ref={dropRef}>
-            {hasAtLeastOneFolder && (
-              <div className="tag-fold-container">
-                <a
-                  role="button"
-                  className={`tag-fold focus:shadow-inner ${showChildren ? 'opened' : 'closed'} ${
-                    !hasChildren ? 'invisible' : ''
-                  }`}
-                  onClick={hasChildren ? toggleChildren : undefined}
-                >
-                  <Icon className={'text-neutral'} type={showChildren ? 'menu-arrow-down-alt' : 'menu-arrow-right'} />
-                </a>
-              </div>
-            )}
-            <div
-              className={classNames('tag-icon draggable mr-2', isCollapsed ? 'md-only:!hidden lg-only:!hidden' : '')}
-              ref={dragRef}
-            >
-              <Icon type="hashtag" className={`${isSelected ? 'text-info' : 'text-neutral'}`} />
-            </div>
-            {isEditing ? (
-              <input
-                className={classNames(
-                  'title editing focus:shadow-none focus:outline-none',
-                  isCollapsed ? 'md-only:!w-min lg-only:!w-min' : '',
-                )}
-                id={`react-tag-${tag.uuid}`}
-                onBlur={onBlur}
-                onInput={onInput}
-                value={title}
-                onKeyDown={onKeyDown}
-                spellCheck={false}
-                ref={inputRef}
-              />
-            ) : (
-              <div
-                className={classNames(
-                  'title overflow-hidden text-left focus:shadow-none focus:outline-none',
-                  isCollapsed ? 'md-only:!w-min lg-only:!w-min' : '',
-                )}
-                id={`react-tag-${tag.uuid}`}
-              >
-                {title}
-              </div>
-            )}
-            <div className="flex items-center">
+  const readyToDrop = isOver && canDrop
+
+  const toggleContextMenu: MouseEventHandler<HTMLAnchorElement> = useCallback(
+    (event) => {
+      event.preventDefault()
+      event.stopPropagation()
+
+      if (!menuButtonRef.current) {
+        return
+      }
+
+      const contextMenuOpen = tagsState.contextMenuOpen
+      const menuButtonRect = menuButtonRef.current?.getBoundingClientRect()
+
+      if (contextMenuOpen) {
+        tagsState.setContextMenuOpen(false)
+      } else {
+        onContextMenu(tag, menuButtonRect.right, menuButtonRect.top)
+      }
+    },
+    [onContextMenu, tagsState, tag],
+  )
+
+  return (
+    <>
+      <button
+        className={`tag focus:shadow-inner ${isSelected ? 'selected' : ''} ${readyToDrop ? 'is-drag-over' : ''}`}
+        onClick={selectCurrentTag}
+        ref={dragRef}
+        style={{
+          paddingLeft: `${level * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`,
+        }}
+        onContextMenu={(e) => {
+          e.preventDefault()
+          onContextMenu(tag, e.clientX, e.clientY)
+        }}
+      >
+        <div className="tag-info" title={title} ref={dropRef}>
+          {hasAtLeastOneFolder && (
+            <div className="tag-fold-container">
               <a
                 role="button"
-                className={`mr-2 cursor-pointer border-0 bg-transparent hover:bg-contrast focus:shadow-inner ${
-                  isSelected ? 'visible' : 'invisible'
+                className={`tag-fold focus:shadow-inner ${showChildren ? 'opened' : 'closed'} ${
+                  !hasChildren ? 'invisible' : ''
                 }`}
-                onClick={toggleContextMenu}
-                ref={menuButtonRef}
+                onClick={hasChildren ? toggleChildren : undefined}
               >
-                <Icon type="more" className="text-neutral" />
+                <Icon className={'text-neutral'} type={showChildren ? 'menu-arrow-down-alt' : 'menu-arrow-right'} />
               </a>
-              <div className="count">{noteCounts.get()}</div>
             </div>
+          )}
+          <div className={'tag-icon draggable mr-2'} ref={dragRef}>
+            <Icon type="hashtag" className={`${isSelected ? 'text-info' : 'text-neutral'}`} />
           </div>
+          {isEditing ? (
+            <input
+              className={'title editing focus:shadow-none focus:outline-none'}
+              id={`react-tag-${tag.uuid}`}
+              onBlur={onBlur}
+              onInput={onInput}
+              value={title}
+              onKeyDown={onKeyDown}
+              spellCheck={false}
+              ref={inputRef}
+            />
+          ) : (
+            <div
+              className={'title overflow-hidden text-left focus:shadow-none focus:outline-none'}
+              id={`react-tag-${tag.uuid}`}
+            >
+              {title}
+            </div>
+          )}
+          <div className="flex items-center">
+            <a
+              role="button"
+              className={`mr-2 cursor-pointer border-0 bg-transparent hover:bg-contrast focus:shadow-inner ${
+                isSelected ? 'visible' : 'invisible'
+              }`}
+              onClick={toggleContextMenu}
+              ref={menuButtonRef}
+            >
+              <Icon type="more" className="text-neutral" />
+            </a>
+            <div className="count">{noteCounts.get()}</div>
+          </div>
+        </div>
 
-          <div className={`meta ${hasAtLeastOneFolder ? 'with-folders' : ''}`}>
-            {tag.conflictOf && <div className="danger text-[0.625rem] font-bold">Conflicted Copy {tag.conflictOf}</div>}
-          </div>
-        </button>
-        {isAddingSubtag && (
-          <div
-            className="tag overflow-hidden"
-            style={{
-              paddingLeft: `${(level + 1) * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`,
-            }}
-          >
-            <div className="tag-info">
-              <div className="flex h-full min-w-[22px] items-center border-0 bg-transparent p-0" />
-              <div className="tag-icon mr-1">
-                <Icon type="hashtag" className="mr-1 text-neutral" />
-              </div>
-              <input
-                className="title w-full focus:shadow-none focus:outline-none"
-                type="text"
-                ref={subtagInputRef}
-                onBlur={onSubtagInputBlur}
-                onKeyDown={onSubtagKeyDown}
-                value={subtagTitle}
-                onInput={onSubtagInput}
-              />
+        <div className={`meta ${hasAtLeastOneFolder ? 'with-folders' : ''}`}>
+          {tag.conflictOf && <div className="danger text-[0.625rem] font-bold">Conflicted Copy {tag.conflictOf}</div>}
+        </div>
+      </button>
+      {isAddingSubtag && (
+        <div
+          className="tag overflow-hidden"
+          style={{
+            paddingLeft: `${(level + 1) * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`,
+          }}
+        >
+          <div className="tag-info">
+            <div className="flex h-full min-w-[22px] items-center border-0 bg-transparent p-0" />
+            <div className="tag-icon mr-1">
+              <Icon type="hashtag" className="mr-1 text-neutral" />
             </div>
+            <input
+              className="title w-full focus:shadow-none focus:outline-none"
+              type="text"
+              ref={subtagInputRef}
+              onBlur={onSubtagInputBlur}
+              onKeyDown={onSubtagKeyDown}
+              value={subtagTitle}
+              onInput={onSubtagInput}
+            />
           </div>
-        )}
-        {showChildren && (
-          <>
-            {childrenTags.map((tag) => {
-              return (
-                <TagsListItem
-                  level={level + 1}
-                  key={tag.uuid}
-                  tag={tag}
-                  tagsState={tagsState}
-                  features={features}
-                  onContextMenu={onContextMenu}
-                  isCollapsed={isCollapsed}
-                />
-              )
-            })}
-          </>
-        )}
-      </>
-    )
-  },
-)
+        </div>
+      )}
+      {showChildren && (
+        <>
+          {childrenTags.map((tag) => {
+            return (
+              <TagsListItem
+                level={level + 1}
+                key={tag.uuid}
+                tag={tag}
+                tagsState={tagsState}
+                features={features}
+                onContextMenu={onContextMenu}
+              />
+            )
+          })}
+        </>
+      )}
+    </>
+  )
+})
 
 TagsListItem.displayName = 'TagsListItem'
diff --git a/packages/web/src/javascripts/Components/Tags/TagsSection.tsx b/packages/web/src/javascripts/Components/Tags/TagsSection.tsx
index 8cda8fcb4..c2b30b405 100644
--- a/packages/web/src/javascripts/Components/Tags/TagsSection.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagsSection.tsx
@@ -5,14 +5,12 @@ import { observer } from 'mobx-react-lite'
 import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 import TagsSectionAddButton from './TagsSectionAddButton'
 import TagsSectionTitle from './TagsSectionTitle'
-import { classNames } from '@/Utils/ConcatenateClassNames'
 
 type Props = {
   viewControllerManager: ViewControllerManager
-  isCollapsed: boolean
 }
 
-const TagsSection: FunctionComponent<Props> = ({ viewControllerManager, isCollapsed }) => {
+const TagsSection: FunctionComponent<Props> = ({ viewControllerManager }) => {
   const [hasMigration, setHasMigration] = useState<boolean>(false)
 
   const checkIfMigrationNeeded = useCallback(() => {
@@ -55,7 +53,7 @@ const TagsSection: FunctionComponent<Props> = ({ viewControllerManager, isCollap
 
   return (
     <section>
-      <div className={classNames('section-title-bar', isCollapsed ? 'md-only:hidden lg-only:hidden' : '')}>
+      <div className={'section-title-bar'}>
         <div className="section-title-bar-header">
           <TagsSectionTitle
             features={viewControllerManager.featuresController}
@@ -68,13 +66,7 @@ const TagsSection: FunctionComponent<Props> = ({ viewControllerManager, isCollap
           />
         </div>
       </div>
-      <div
-        className={classNames(
-          'hidden',
-          isCollapsed ? 'mt-6 mb-7 border border-border md-only:block lg-only:block' : '',
-        )}
-      />
-      <TagsList viewControllerManager={viewControllerManager} isCollapsed={isCollapsed} />
+      <TagsList viewControllerManager={viewControllerManager} />
     </section>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Tags/TagsSectionAddButton.tsx b/packages/web/src/javascripts/Components/Tags/TagsSectionAddButton.tsx
index 361913406..4316733c6 100644
--- a/packages/web/src/javascripts/Components/Tags/TagsSectionAddButton.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagsSectionAddButton.tsx
@@ -7,16 +7,15 @@ import { FunctionComponent } from 'react'
 type Props = {
   tags: NavigationController
   features: FeaturesController
-  className?: string
 }
 
-const TagsSectionAddButton: FunctionComponent<Props> = ({ tags, className = '' }) => {
+const TagsSectionAddButton: FunctionComponent<Props> = ({ tags }) => {
   return (
     <IconButton
       focusable={true}
       icon="add"
       title="Create a new tag"
-      className={`p-0 text-neutral ${className}`}
+      className="p-0 text-neutral"
       onClick={() => tags.createNewTemplate()}
     />
   )
diff --git a/packages/web/src/javascripts/Components/Tags/TagsSectionTitle.tsx b/packages/web/src/javascripts/Components/Tags/TagsSectionTitle.tsx
index dfe4e44b6..23415920f 100644
--- a/packages/web/src/javascripts/Components/Tags/TagsSectionTitle.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagsSectionTitle.tsx
@@ -9,10 +9,9 @@ type Props = {
   features: FeaturesController
   hasMigration: boolean
   onClickMigration: () => void
-  className?: string
 }
 
-const TagsSectionTitle: FunctionComponent<Props> = ({ features, hasMigration, onClickMigration, className = '' }) => {
+const TagsSectionTitle: FunctionComponent<Props> = ({ features, hasMigration, onClickMigration }) => {
   const entitledToFolders = features.hasFolders
   const modal = usePremiumModal()
 
@@ -23,7 +22,7 @@ const TagsSectionTitle: FunctionComponent<Props> = ({ features, hasMigration, on
   if (entitledToFolders) {
     return (
       <>
-        <div className={`title text-sm ${className}`}>
+        <div className="title text-sm">
           <span className="font-bold">Folders</span>
           {hasMigration && (
             <label className="ml-1 cursor-pointer font-bold text-info" onClick={onClickMigration}>
@@ -37,7 +36,7 @@ const TagsSectionTitle: FunctionComponent<Props> = ({ features, hasMigration, on
 
   return (
     <>
-      <div className={`title text-sm ${className}`}>
+      <div className="title text-sm">
         <span className="font-bold">Tags</span>
         <Tooltip label={TAG_FOLDERS_FEATURE_TOOLTIP}>
           <label className="ml-1 cursor-pointer font-bold text-passive-2" onClick={showPremiumAlert}>
diff --git a/packages/web/src/stylesheets/_editor.scss b/packages/web/src/stylesheets/_editor.scss
index 7b36d7fcb..9bdf0d3f4 100644
--- a/packages/web/src/stylesheets/_editor.scss
+++ b/packages/web/src/stylesheets/_editor.scss
@@ -67,11 +67,6 @@ $heading-height: 75px;
     position: relative;
     min-width: 16ch;
     overflow: visible;
-    margin-right: 20px;
-
-    @media screen and (min-width: 768px) {
-      max-width: 16ch;
-    }
   }
 
   #save-status {
diff --git a/packages/web/src/stylesheets/_sn.scss b/packages/web/src/stylesheets/_sn.scss
index 7962041f5..d6e03f578 100644
--- a/packages/web/src/stylesheets/_sn.scss
+++ b/packages/web/src/stylesheets/_sn.scss
@@ -132,21 +132,6 @@
   @include DimmedBackground(var(--sn-stylekit-info-color), 0.08);
 }
 
-.transparent-info-color-background {
-  &::after {
-    @include DimmedBackground(var(--sn-stylekit-info-color), 0.12);
-    border-radius: 100px;
-  }
-}
-
-.transparent-info-color-background-hover {
-  &:hover {
-    &::after {
-      @extend .transparent-info-color-background;
-    }
-  }
-}
-
 svg.sk-circular-progress {
   $pi: 3.14159265358979;