diff --git a/components/canvas/canvas.tsx b/components/canvas/canvas.tsx
index 0e8c5875b..8c071e56c 100644
--- a/components/canvas/canvas.tsx
+++ b/components/canvas/canvas.tsx
@@ -11,7 +11,7 @@ import BoundsBg from './bounds/bounds-bg'
 import Selected from './selected'
 import Handles from './bounds/handles'
 import useCanvasEvents from 'hooks/useCanvasEvents'
-import ContextMenu from 'components/context-menu'
+import ContextMenu from './context-menu/context-menu'
 
 export default function Canvas() {
   const rCanvas = useRef<SVGSVGElement>(null)
diff --git a/components/context-menu.tsx b/components/canvas/context-menu/context-menu.tsx
similarity index 65%
rename from components/context-menu.tsx
rename to components/canvas/context-menu/context-menu.tsx
index f11e3cb76..2b17d29f7 100644
--- a/components/context-menu.tsx
+++ b/components/canvas/context-menu/context-menu.tsx
@@ -1,7 +1,11 @@
 import * as _ContextMenu from '@radix-ui/react-context-menu'
 import * as _Dropdown from '@radix-ui/react-dropdown-menu'
 import styled from 'styles'
-import { IconWrapper, RowButton } from './shared'
+import {
+  IconWrapper,
+  IconButton as _IconButton,
+  RowButton,
+} from 'components/shared'
 import {
   commandKey,
   deepCompareArrays,
@@ -9,9 +13,67 @@ import {
   isMobile,
 } from 'utils/utils'
 import state, { useSelector } from 'state'
-import { MoveType, ShapeType } from 'types'
+import {
+  AlignType,
+  DistributeType,
+  MoveType,
+  ShapeType,
+  StretchType,
+} from 'types'
 import React, { useRef } from 'react'
-import { ChevronRightIcon } from '@radix-ui/react-icons'
+import {
+  ChevronRightIcon,
+  AlignBottomIcon,
+  AlignCenterHorizontallyIcon,
+  AlignCenterVerticallyIcon,
+  AlignLeftIcon,
+  AlignRightIcon,
+  AlignTopIcon,
+  SpaceEvenlyHorizontallyIcon,
+  SpaceEvenlyVerticallyIcon,
+  StretchHorizontallyIcon,
+  StretchVerticallyIcon,
+} from '@radix-ui/react-icons'
+
+function alignTop() {
+  state.send('ALIGNED', { type: AlignType.Top })
+}
+
+function alignCenterVertical() {
+  state.send('ALIGNED', { type: AlignType.CenterVertical })
+}
+
+function alignBottom() {
+  state.send('ALIGNED', { type: AlignType.Bottom })
+}
+
+function stretchVertically() {
+  state.send('STRETCHED', { type: StretchType.Vertical })
+}
+
+function distributeVertically() {
+  state.send('DISTRIBUTED', { type: DistributeType.Vertical })
+}
+
+function alignLeft() {
+  state.send('ALIGNED', { type: AlignType.Left })
+}
+
+function alignCenterHorizontal() {
+  state.send('ALIGNED', { type: AlignType.CenterHorizontal })
+}
+
+function alignRight() {
+  state.send('ALIGNED', { type: AlignType.Right })
+}
+
+function stretchHorizontally() {
+  state.send('STRETCHED', { type: StretchType.Horizontal })
+}
+
+function distributeHorizontally() {
+  state.send('DISTRIBUTED', { type: DistributeType.Horizontal })
+}
 
 export default function ContextMenu({
   children,
@@ -26,7 +88,8 @@ export default function ContextMenu({
   const rContent = useRef<HTMLDivElement>(null)
 
   const hasGroupSelectd = selectedShapes.some((s) => s.type === ShapeType.Group)
-  const hasMultipleSelected = selectedShapes.length > 1
+  const hasTwoOrMore = selectedShapes.length > 1
+  const hasThreeOrMore = selectedShapes.length > 2
 
   return (
     <_ContextMenu.Root>
@@ -58,7 +121,7 @@ export default function ContextMenu({
             </Button>
             <StyledDivider />
             {hasGroupSelectd ||
-              (hasMultipleSelected && (
+              (hasTwoOrMore && (
                 <>
                   {hasGroupSelectd && (
                     <Button onSelect={() => state.send('UNGROUPED')}>
@@ -70,7 +133,7 @@ export default function ContextMenu({
                       </kbd>
                     </Button>
                   )}
-                  {hasMultipleSelected && (
+                  {hasTwoOrMore && (
                     <Button onSelect={() => state.send('GROUPED')}>
                       <span>Group</span>
                       <kbd>
@@ -138,6 +201,12 @@ export default function ContextMenu({
                 </kbd>
               </Button>
             </SubMenu>
+            {hasTwoOrMore && (
+              <AlignDistributeSubMenu
+                hasTwoOrMore={hasTwoOrMore}
+                hasThreeOrMore={hasThreeOrMore}
+              />
+            )}
             <MoveToPageMenu />
             <StyledDivider />
             <Button onSelect={() => state.send('DELETED')}>
@@ -232,6 +301,27 @@ function Button({
   )
 }
 
+function IconButton({
+  onSelect,
+  children,
+  disabled = false,
+}: {
+  onSelect: () => void
+  disabled?: boolean
+  children: React.ReactNode
+}) {
+  return (
+    <_ContextMenu.Item
+      as={_IconButton}
+      bp={{ '@initial': 'mobile', '@sm': 'small' }}
+      disabled={disabled}
+      onSelect={onSelect}
+    >
+      {children}
+    </_ContextMenu.Item>
+  )
+}
+
 function SubMenu({
   children,
   label,
@@ -258,6 +348,85 @@ function SubMenu({
   )
 }
 
+function AlignDistributeSubMenu({
+  hasTwoOrMore,
+  hasThreeOrMore,
+}: {
+  hasTwoOrMore: boolean
+  hasThreeOrMore: boolean
+}) {
+  return (
+    <_ContextMenu.Root>
+      <_ContextMenu.TriggerItem
+        as={RowButton}
+        bp={{ '@initial': 'mobile', '@sm': 'small' }}
+      >
+        <span>Align / Distribute</span>
+        <IconWrapper size="small">
+          <ChevronRightIcon />
+        </IconWrapper>
+      </_ContextMenu.TriggerItem>
+      <StyledGrid
+        sideOffset={2}
+        alignOffset={-2}
+        isMobile={isMobile()}
+        selectedStyle={hasThreeOrMore ? 'threeOrMore' : 'twoOrMore'}
+      >
+        <IconButton onSelect={alignLeft}>
+          <AlignLeftIcon />
+        </IconButton>
+        <IconButton onSelect={alignCenterHorizontal}>
+          <AlignCenterHorizontallyIcon />
+        </IconButton>
+        <IconButton onSelect={alignRight}>
+          <AlignRightIcon />
+        </IconButton>
+        <IconButton onSelect={stretchHorizontally}>
+          <StretchHorizontallyIcon />
+        </IconButton>
+        {hasThreeOrMore && (
+          <IconButton onSelect={distributeHorizontally}>
+            <SpaceEvenlyHorizontallyIcon />
+          </IconButton>
+        )}
+
+        <IconButton onSelect={alignTop}>
+          <AlignTopIcon />
+        </IconButton>
+        <IconButton onSelect={alignCenterVertical}>
+          <AlignCenterVerticallyIcon />
+        </IconButton>
+        <IconButton onSelect={alignBottom}>
+          <AlignBottomIcon />
+        </IconButton>
+        <IconButton onSelect={stretchVertically}>
+          <StretchVerticallyIcon />
+        </IconButton>
+        {hasThreeOrMore && (
+          <IconButton onSelect={distributeVertically}>
+            <SpaceEvenlyVerticallyIcon />
+          </IconButton>
+        )}
+        <StyledArrow offset={13} />
+      </StyledGrid>
+    </_ContextMenu.Root>
+  )
+}
+
+const StyledGrid = styled(StyledContent, {
+  display: 'grid',
+  variants: {
+    selectedStyle: {
+      threeOrMore: {
+        gridTemplateColumns: 'repeat(5, auto)',
+      },
+      twoOrMore: {
+        gridTemplateColumns: 'repeat(4, auto)',
+      },
+    },
+  },
+})
+
 function MoveToPageMenu() {
   const documentPages = useSelector((s) => s.data.document.pages)
   const currentPageId = useSelector((s) => s.data.currentPageId)
@@ -268,6 +437,8 @@ function MoveToPageMenu() {
     .sort((a, b) => a.childIndex - b.childIndex)
     .filter((a) => a.id !== currentPageId)
 
+  if (sorted.length === 0) return null
+
   return (
     <_ContextMenu.Root>
       <_ContextMenu.TriggerItem
diff --git a/components/canvas/shape.tsx b/components/canvas/shape.tsx
index 567fbae46..76b00c716 100644
--- a/components/canvas/shape.tsx
+++ b/components/canvas/shape.tsx
@@ -7,7 +7,7 @@ import { ShapeStyles, ShapeType } from 'types'
 import useShapeEvents from 'hooks/useShapeEvents'
 import vec from 'utils/vec'
 import { getShapeStyle } from 'lib/shape-styles'
-import ContextMenu from 'components/context-menu'
+import ContextMenu from 'components/canvas/context-menu/context-menu'
 
 interface ShapeProps {
   id: string
diff --git a/components/editor.tsx b/components/editor.tsx
index 107ac938c..4f5f66e83 100644
--- a/components/editor.tsx
+++ b/components/editor.tsx
@@ -9,7 +9,7 @@ import StylePanel from './style-panel/style-panel'
 import { useSelector } from 'state'
 import styled from 'styles'
 import PagePanel from './page-panel/page-panel'
-import ContextMenu from './context-menu'
+import ContextMenu from './canvas/context-menu/context-menu'
 
 export default function Editor() {
   useKeyboardEvents()
diff --git a/components/shared.tsx b/components/shared.tsx
index e4e1b2eae..d561bc388 100644
--- a/components/shared.tsx
+++ b/components/shared.tsx
@@ -2,7 +2,6 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
 import * as RadioGroup from '@radix-ui/react-radio-group'
 import * as Panel from './panel'
 import styled from 'styles'
-import Tooltip from './tooltip'
 
 export const IconButton = styled('button', {
   height: '32px',
diff --git a/state/commands/create-page.ts b/state/commands/create-page.ts
index 74ae43b6a..7bdf34852 100644
--- a/state/commands/create-page.ts
+++ b/state/commands/create-page.ts
@@ -5,7 +5,7 @@ import { uniqueId } from 'utils/utils'
 import { current } from 'immer'
 import storage from 'state/storage'
 
-export default function createPage(data: Data) {
+export default function createPage(data: Data, goToPage = true) {
   const snapshot = getSnapshot(data)
 
   history.execute(
@@ -14,12 +14,19 @@ export default function createPage(data: Data) {
       name: 'change_page',
       category: 'canvas',
       do(data) {
-        const { page, pageState } = snapshot
+        const { page, pageState, currentPageId } = snapshot
         data.document.pages[page.id] = page
         data.pageStates[page.id] = pageState
+
         data.currentPageId = page.id
         storage.savePage(data, data.document.id, page.id)
         storage.saveDocumentToLocalStorage(data)
+
+        if (goToPage) {
+          data.currentPageId = page.id
+        } else {
+          data.currentPageId = currentPageId
+        }
       },
       undo(data) {
         const { page, currentPageId } = snapshot
@@ -46,6 +53,7 @@ function getSnapshot(data: Data) {
     childIndex: pages.length,
     shapes: {},
   }
+
   const pageState: PageState = {
     id,
     selectedIds: new Set([]),
diff --git a/state/state.ts b/state/state.ts
index a686d0782..e240fd51c 100644
--- a/state/state.ts
+++ b/state/state.ts
@@ -26,6 +26,7 @@ import {
   setSelectedIds,
   getPageState,
   getShapes,
+  setToArray,
 } from 'utils/utils'
 import {
   Data,
@@ -1001,12 +1002,11 @@ const state = createState({
       commands.changePage(data, payload.id)
     },
     createPage(data) {
-      commands.createPage(data)
+      commands.createPage(data, true)
     },
     deletePage(data, payload: { id: string }) {
       commands.deletePage(data, payload.id)
     },
-
     /* --------------------- Shapes --------------------- */
     resetShapes(data) {
       const page = getPage(data)