diff --git a/package.json b/package.json
index ead0a49..9c4da16 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cellpop",
   "private": false,
-  "version": "0.0.7",
+  "version": "0.0.13",
   "license": "MIT",
   "author": "Thomas Smits",
   "description": "A React component for visualizing cell populations in two-dimensional array data.",
diff --git a/src/CellPopComponent.tsx b/src/CellPopComponent.tsx
index 4ea062d..4ad141b 100644
--- a/src/CellPopComponent.tsx
+++ b/src/CellPopComponent.tsx
@@ -86,7 +86,11 @@ export const CellPop = withParentSize(
 
     return (
       <OuterContainerRefProvider value={outerContainerRef}>
-        <div onClick={handleClick} ref={outerContainerRef}>
+        <div
+          onClick={handleClick}
+          ref={outerContainerRef}
+          style={{ position: "relative", overflow: "hidden" }}
+        >
           <Providers
             data={data}
             dimensions={dimensions}
diff --git a/src/contexts/ColorScaleContext.tsx b/src/contexts/ColorScaleContext.tsx
index 12cbbac..d1fbcca 100644
--- a/src/contexts/ColorScaleContext.tsx
+++ b/src/contexts/ColorScaleContext.tsx
@@ -36,7 +36,6 @@ export function ColorScaleProvider({ children }: PropsWithChildren) {
 
     const range = colorThresholds.map((_, idx) => idx / 255);
 
-    console.log({ range });
     const scale = scaleLinear<string>({
       range: range.map((t) => theme(t)),
       domain: range.map((r) => r * maxCount),
diff --git a/src/contexts/ScaleContext.tsx b/src/contexts/ScaleContext.tsx
index 005bcfc..62f0fd1 100644
--- a/src/contexts/ScaleContext.tsx
+++ b/src/contexts/ScaleContext.tsx
@@ -65,8 +65,8 @@ export function ScaleProvider({ children }: PropsWithChildren) {
     if (
       // if no rows are selected/all rows are selected
       [0, rows.length].includes(expandedRows.size) ||
-      // if all selected rows are hidden
-      [...expandedRows].every((row) => !rows.includes(row))
+      // if there are very few rows
+      rows.length < 5
     ) {
       const scale = scaleBand<string>({
         range: [height, 0],
diff --git a/src/visx-visualization/Controls.tsx b/src/visx-visualization/Controls.tsx
index 5dc47f8..808f397 100644
--- a/src/visx-visualization/Controls.tsx
+++ b/src/visx-visualization/Controls.tsx
@@ -152,13 +152,27 @@ function NormalizationControl() {
   });
 
   const id = useId();
+
+  const currentTheme = useSetTheme((state) => state.currentTheme);
+
   if (normalizationIsDisabled) {
     return null;
   }
 
   return (
     <FormControl sx={{ maxWidth: 300 }}>
-      <InputLabel id={id}>Heatmap Normalization</InputLabel>
+      <InputLabel
+        id={id}
+        sx={(theme) => ({
+          background:
+            currentTheme === "dark"
+              ? theme.palette.background.default
+              : theme.palette.grey[100],
+          paddingRight: 2,
+        })}
+      >
+        Heatmap&nbsp;Normalization
+      </InputLabel>
       <Select
         labelId={id}
         id={`${id}-select`}
@@ -185,12 +199,7 @@ function NormalizationControl() {
 export default function Controls() {
   const currentTheme = useSetTheme((state) => state.currentTheme);
   return (
-    <AppBar
-      position="static"
-      elevation={0}
-      color={currentTheme === "dark" ? "default" : "default"}
-      sx={{ pt: 2 }}
-    >
+    <AppBar position="static" elevation={0} color={"default"} sx={{ pt: 2 }}>
       <Stack direction="row" spacing={5} p={1}>
         <HeatmapThemeControl />
         <NormalizationControl />
diff --git a/src/visx-visualization/heatmap/Heatmap.tsx b/src/visx-visualization/heatmap/Heatmap.tsx
index bc40465..1b5f475 100644
--- a/src/visx-visualization/heatmap/Heatmap.tsx
+++ b/src/visx-visualization/heatmap/Heatmap.tsx
@@ -53,8 +53,10 @@ function CanvasHeatmapRenderer() {
         // draw bar graph
         const max = rowMaxes[row];
 
+        const domain = normalization === "None" ? [0, max] : [0, 1];
+
         const inlineYScale = scaleLinear({
-          domain: [0, max],
+          domain,
           range: [0, cellHeight],
           nice: true,
         });
diff --git a/src/visx-visualization/heatmap/HeatmapYAxis.tsx b/src/visx-visualization/heatmap/HeatmapYAxis.tsx
index 5e37dbf..0eaead4 100644
--- a/src/visx-visualization/heatmap/HeatmapYAxis.tsx
+++ b/src/visx-visualization/heatmap/HeatmapYAxis.tsx
@@ -9,7 +9,7 @@ import {
 import { scaleLinear } from "@visx/scale";
 import { Text } from "@visx/text";
 import React, { useId } from "react";
-import { AxisConfig, useRowConfig } from "../../contexts/AxisConfigContext";
+import { useRowConfig } from "../../contexts/AxisConfigContext";
 import {
   useData,
   useRowCounts,
@@ -18,6 +18,7 @@ import {
 } from "../../contexts/DataContext";
 import { usePanelDimensions } from "../../contexts/DimensionsContext";
 import { useSelectedValues } from "../../contexts/ExpandedValuesContext";
+import { useNormalization } from "../../contexts/NormalizationContext";
 import { EXPANDED_ROW_PADDING, useYScale } from "../../contexts/ScaleContext";
 import { useSetTooltipData } from "../../contexts/TooltipDataContext";
 import { LEFT_MULTIPLIER } from "../side-graphs/constants";
@@ -72,17 +73,18 @@ export default function HeatmapYAxis() {
         left={tickLabelSize * LEFT_MULTIPLIER}
         stroke={theme.palette.text.primary}
         tickStroke={theme.palette.text.primary}
-        tickComponent={
-          selectedValues.size > 0
-            ? (props) =>
-                ExpandedRowTick({
-                  ...props,
-                  axisConfig,
-                  openInNewTab,
-                  tickTitle,
-                  tickLabelStyle,
-                })
-            : undefined
+        tickComponent={(tickLabelProps: TickRendererProps) =>
+          selectedValues.has(tickLabelProps?.formattedValue as string) ? (
+            <ExpandedRowTick {...tickLabelProps} />
+          ) : (
+            <Text
+              {...tickLabelProps}
+              // @ts-expect-error Visx types are slightly incorrect
+              x={(tickLabelProps?.to?.x ?? 0) - tickLabelProps.fontSize}
+            >
+              {tickLabelProps?.formattedValue}
+            </Text>
+          )
         }
         tickLabelProps={(t) =>
           ({
@@ -118,6 +120,7 @@ export default function HeatmapYAxis() {
           fill: theme.palette.text.primary,
           pointerEvents: "none",
           className: "y-axis-label text",
+          dy: `${TICK_TEXT_SIZE * LEFT_MULTIPLIER}px`,
         }}
         hideTicks={selectedValues.size > 0}
       />
@@ -129,18 +132,17 @@ function ExpandedRowTick({
   x,
   y,
   formattedValue: row,
-  axisConfig,
-  openInNewTab,
-  tickTitle,
-  tickLabelStyle,
   ...tickLabelProps
-}: TickRendererProps & {
-  axisConfig: AxisConfig;
-} & ReturnType<typeof useHeatmapAxis>) {
-  const { expandedSize } = useYScale();
+}: TickRendererProps) {
+  const { expandedSize, nonExpandedSize } = useYScale();
   const selectedValues = useSelectedValues((s) => s.selectedValues);
-  const { flipAxisPosition } = axisConfig;
   const rowMaxes = useRowMaxes();
+  const axisConfig = useRowConfig();
+  const rows = useRows();
+  const { flipAxisPosition } = axisConfig;
+
+  const { openInNewTab, tickTitle, tickLabelStyle } =
+    useHeatmapAxis(axisConfig);
 
   const panelSize = usePanelDimensions(
     flipAxisPosition ? "left_middle" : "right_middle",
@@ -155,19 +157,39 @@ function ExpandedRowTick({
     // Use the tick label as the axis label
     const Axis = flipAxisPosition ? AxisLeft : AxisRight;
     const max = rowMaxes[row!];
+    const range =
+      expandedSize > nonExpandedSize
+        ? [EXPANDED_ROW_PADDING, expandedSize - EXPANDED_ROW_PADDING / 2]
+        : [EXPANDED_ROW_PADDING, nonExpandedSize];
+
+    const normalizationIsNotNone = useNormalization(
+      (s) => s.normalization !== "None",
+    );
+
+    const domain = normalizationIsNotNone ? [1, 0] : [max, 0];
+
     const yScale = scaleLinear({
-      domain: [max, 0],
-      range: [EXPANDED_ROW_PADDING, expandedSize - EXPANDED_ROW_PADDING],
+      domain,
+      range,
       nice: true,
     });
+
+    const top =
+      expandedSize > nonExpandedSize
+        ? y - nonExpandedSize / 2 - EXPANDED_ROW_PADDING * 2
+        : y - expandedSize / 2;
+
     return (
       <Axis
-        top={y - EXPANDED_ROW_PADDING * 2}
+        top={top}
         orientation="left"
         left={panelSize.width - tickLabelSize * LEFT_MULTIPLIER}
         scale={yScale}
         label={row}
         labelOffset={expandedSize / 2}
+        tickFormat={
+          normalizationIsNotNone ? (v) => `${(v as number) * 100}%` : undefined
+        }
         tickLabelProps={{
           fill: theme.palette.text.primary,
           style: tickLabelStyle,
diff --git a/src/visx-visualization/heatmap/MetadataValueBar.tsx b/src/visx-visualization/heatmap/MetadataValueBar.tsx
index 75ca2f9..5ae9df9 100644
--- a/src/visx-visualization/heatmap/MetadataValueBar.tsx
+++ b/src/visx-visualization/heatmap/MetadataValueBar.tsx
@@ -135,7 +135,7 @@ export default function MetadataValueBar({
   const cellWidth = x.bandwidth();
 
   const axisLabelX = axis === "X" ? width / 2 : width / 3;
-  const axisLabelY = axis === "X" ? height / 3 : height / 2;
+  const axisLabelY = axis === "X" ? height - 16 : height / 2;
 
   const onMouseMove = useCallback((e: React.MouseEvent<SVGRectElement>) => {
     const target = e.target as SVGRectElement;
diff --git a/src/visx-visualization/plot-controls.tsx/DisplayControls.tsx b/src/visx-visualization/plot-controls.tsx/DisplayControls.tsx
index 8f3385b..44b7836 100644
--- a/src/visx-visualization/plot-controls.tsx/DisplayControls.tsx
+++ b/src/visx-visualization/plot-controls.tsx/DisplayControls.tsx
@@ -292,11 +292,16 @@ const useToggleVisibility = () => {
   const rowLabel = useRowConfig((s) => s.label);
   const label = section === "Column" ? columnLabel : rowLabel;
   const trackEvent = useTrackEvent();
+  const selectedValues = useSelectedValues((s) => s.selectedValues);
+  const deselectValue = useSelectedValues((s) => s.deselectValue);
   const handleChange = useEventCallback((e: ChangeEvent<HTMLInputElement>) => {
     if (e.target.checked) {
       showItem(e.target.name);
       trackEvent(`Show ${label}`, e.target.name);
     } else {
+      if (section === "Row" && selectedValues.has(e.target.name)) {
+        deselectValue(e.target.name);
+      }
       hideItem(e.target.name);
       trackEvent(`Hide ${label}`, e.target.name);
     }
@@ -309,13 +314,20 @@ const useToggleExpansion = () => {
     toggleItem: s.toggleValue,
     selectedValues: s.selectedValues,
   }));
+  const showItem = useData((s) => s.restoreRow);
+  const removedRows = useData((s) => s.removedRows);
   const trackEvent = useTrackEvent();
   const rowLabel = useRowConfig((s) => s.label);
   const handleChange = useEventCallback((e: ChangeEvent<HTMLInputElement>) => {
-    if (selectedValues.has(e.target.name)) {
-      trackEvent(`Collapse ${rowLabel}`, e.target.name);
+    const row = e.target.name;
+    if (selectedValues.has(row)) {
+      trackEvent(`Collapse ${rowLabel}`, row);
     } else {
-      trackEvent(`Expand ${rowLabel}`, e.target.name);
+      const rowIsHidden = removedRows.has(row);
+      if (rowIsHidden) {
+        showItem(e.target.name);
+      }
+      trackEvent(`Expand ${rowLabel}`, row);
     }
     toggleItem(e.target.name);
   });
diff --git a/src/visx-visualization/plot-controls.tsx/PlotControls.tsx b/src/visx-visualization/plot-controls.tsx/PlotControls.tsx
index 5c15e96..20cb2c2 100644
--- a/src/visx-visualization/plot-controls.tsx/PlotControls.tsx
+++ b/src/visx-visualization/plot-controls.tsx/PlotControls.tsx
@@ -8,6 +8,7 @@ import {
   Divider,
   IconButton,
   Stack,
+  styled,
   Tab,
   Tabs,
   Typography,
@@ -121,13 +122,17 @@ function PlotControls({ onClose }: PlotControlsProps) {
   );
 }
 
+const StyledDrawer = styled(Drawer)(() => ({
+  position: "absolute",
+  top: 0,
+  zIndex: 1099,
+}));
+
 export function PlotControlsButton() {
   const parentRef = useOuterContainerRef();
   const [showDrawer, setShowDrawer] = useState(false);
   const closeDrawer = useEventCallback(() => setShowDrawer(false));
   const openDrawer = useEventCallback(() => setShowDrawer(true));
-  const parentBoundingBox = parentRef.current?.getBoundingClientRect();
-  const windowBoundingBox = window.document.body.getBoundingClientRect();
 
   return (
     <>
@@ -139,29 +144,22 @@ export function PlotControlsButton() {
       >
         Plot Controls
       </Button>
-      <Drawer
+      <StyledDrawer
         container={parentRef.current}
         open={showDrawer}
         onClose={closeDrawer}
         anchor="right"
-        SlideProps={{
-          container: parentRef.current,
+        transitionDuration={{
+          enter: 0,
+          exit: 300,
         }}
         ModalProps={{
           sx: {
-            top: parentBoundingBox?.top,
-            height: parentBoundingBox?.height,
-            right: windowBoundingBox.right - (parentBoundingBox?.right ?? 0),
+            position: "absolute",
           },
         }}
         slotProps={{
           backdrop: {
-            sx: {
-              top: parentBoundingBox?.top,
-              height: parentBoundingBox?.height,
-              left: parentBoundingBox?.left,
-              width: parentBoundingBox?.width,
-            },
             invisible: true,
           },
         }}
@@ -171,15 +169,15 @@ export function PlotControlsButton() {
               xs: "100%",
               md: 450,
             },
-            top: parentBoundingBox?.top,
-            height: parentBoundingBox?.height,
-            right: windowBoundingBox.right - (parentBoundingBox?.right ?? 0),
+            position: "absolute",
+            top: 0,
+            right: 0,
             scrollBehavior: "smooth",
           },
         }}
       >
         <PlotControls onClose={closeDrawer} />
-      </Drawer>
+      </StyledDrawer>
     </>
   );
 }