diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index e7964657874..dd30c9beced 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
-import {connect} from 'react-redux';
-import {compose} from 'redux';
-import {defineMessages, FormattedMessage, injectIntl, intlShape} from 'react-intl';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { defineMessages, FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import PropTypes from 'prop-types';
 import bindAll from 'lodash.bindall';
 import bowser from 'bowser';
@@ -13,12 +13,12 @@ import Box from '../box/box.jsx';
 import Button from '../button/button.jsx';
 import CommunityButton from './community-button.jsx';
 import ShareButton from './share-button.jsx';
-import {ComingSoonTooltip} from '../coming-soon/coming-soon.jsx';
+import { ComingSoonTooltip } from '../coming-soon/coming-soon.jsx';
 import Divider from '../divider/divider.jsx';
 import LanguageSelector from '../../containers/language-selector.jsx';
 import ProjectWatcher from '../../containers/project-watcher.jsx';
 import MenuBarMenu from './menu-bar-menu.jsx';
-import {MenuItem, MenuSection} from '../menu/menu.jsx';
+import { MenuItem, MenuSection } from '../menu/menu.jsx';
 import ProjectTitleInput from './project-title-input.jsx';
 import AuthorInfo from './author-info.jsx';
 import SB3Downloader from '../../containers/sb3-downloader.jsx';
@@ -29,11 +29,10 @@ import MenuBarHOC from '../../containers/menu-bar-hoc.jsx';
 import FramerateChanger from '../../containers/tw-framerate-changer.jsx';
 import ChangeUsername from '../../containers/tw-change-username.jsx';
 import CloudVariablesToggler from '../../containers/tw-cloud-toggler.jsx';
-import TWRestorePointLoader from '../../containers/tw-restore-point-loader.jsx';
 import TWSaveStatus from './tw-save-status.jsx';
 
-import {openTipsLibrary, openSettingsModal} from '../../reducers/modals';
-import {setPlayer} from '../../reducers/mode';
+import { openTipsLibrary, openSettingsModal, openRestorePointModal } from '../../reducers/modals';
+import { setPlayer } from '../../reducers/mode';
 import {
     autoUpdateProject,
     getIsUpdating,
@@ -66,7 +65,7 @@ import {
     closeLoginMenu,
     loginMenuOpen
 } from '../../reducers/menus';
-import {setFileHandle} from '../../reducers/tw.js';
+import { setFileHandle } from '../../reducers/tw.js';
 
 import collectMetadata from '../../lib/collect-metadata';
 
@@ -84,6 +83,7 @@ import scratchLogo from './scratch-logo.svg';
 import sharedMessages from '../../lib/shared-messages';
 
 import SeeInsideButton from './tw-see-inside.jsx';
+import { notScratchDesktop } from '../../lib/isScratchDesktop.js';
 
 const ariaMessages = defineMessages({
     language: {
@@ -141,7 +141,7 @@ MenuBarItemTooltip.propTypes = {
     place: PropTypes.oneOf(['top', 'bottom', 'left', 'right'])
 };
 
-const MenuItemTooltip = ({id, isRtl, children, className}) => (
+const MenuItemTooltip = ({ id, isRtl, children, className }) => (
     <ComingSoonTooltip
         className={classNames(styles.comingSoon, className)}
         isRtl={isRtl}
@@ -193,15 +193,17 @@ MenuItemLink.propTypes = {
 };
 
 class MenuBar extends React.Component {
-    constructor (props) {
+    constructor(props) {
         super(props);
         bindAll(this, [
             'handleClickSeeInside',
             'handleClickNew',
+            'handleClickNewWindow',
             'handleClickRemix',
             'handleClickSave',
             'handleClickSaveAsCopy',
             'handleClickPackager',
+            'handleClickRestorePoints',
             'handleClickSeeCommunity',
             'handleClickShare',
             'handleKeyPress',
@@ -211,13 +213,13 @@ class MenuBar extends React.Component {
             'restoreOptionMessage'
         ]);
     }
-    componentDidMount () {
+    componentDidMount() {
         document.addEventListener('keydown', this.handleKeyPress);
     }
-    componentWillUnmount () {
+    componentWillUnmount() {
         document.removeEventListener('keydown', this.handleKeyPress);
     }
-    handleClickNew () {
+    handleClickNew() {
         // if the project is dirty, and user owns the project, we will autosave.
         // but if they are not logged in and can't save, user should consider
         // downloading or logging in first.
@@ -232,23 +234,31 @@ class MenuBar extends React.Component {
         }
         this.props.onRequestCloseFile();
     }
-    handleClickRemix () {
+    handleClickNewWindow() {
+        this.props.onClickNewWindow();
+        this.props.onRequestCloseFile();
+    }
+    handleClickRemix() {
         this.props.onClickRemix();
         this.props.onRequestCloseFile();
     }
-    handleClickSave () {
+    handleClickSave() {
         this.props.onClickSave();
         this.props.onRequestCloseFile();
     }
-    handleClickSaveAsCopy () {
+    handleClickSaveAsCopy() {
         this.props.onClickSaveAsCopy();
         this.props.onRequestCloseFile();
     }
-    handleClickPackager () {
+    handleClickPackager() {
         this.props.onClickPackager();
         this.props.onRequestCloseFile();
     }
-    handleClickSeeCommunity (waitForUpdate) {
+    handleClickRestorePoints() {
+        this.props.onClickRestorePoints();
+        this.props.onRequestCloseFile();
+    }
+    handleClickSeeCommunity(waitForUpdate) {
         if (this.props.shouldSaveBeforeTransition()) {
             this.props.autoUpdateProject(); // save before transitioning to project page
             waitForUpdate(true); // queue the transition to project page
@@ -256,7 +266,7 @@ class MenuBar extends React.Component {
             waitForUpdate(false); // immediately transition to project page
         }
     }
-    handleClickShare (waitForUpdate) {
+    handleClickShare(waitForUpdate) {
         if (!this.props.isShared) {
             if (this.props.canShare) { // save before transitioning to project page
                 this.props.onShare();
@@ -269,20 +279,20 @@ class MenuBar extends React.Component {
             }
         }
     }
-    handleRestoreOption (restoreFun) {
+    handleRestoreOption(restoreFun) {
         return () => {
             restoreFun();
             this.props.onRequestCloseEdit();
         };
     }
-    handleKeyPress (event) {
+    handleKeyPress(event) {
         const modifier = bowser.mac ? event.metaKey : event.ctrlKey;
         if (modifier && event.key.toLowerCase() === 's') {
             this.props.handleSaveProject();
             event.preventDefault();
         }
     }
-    getSaveToComputerHandler (downloadProjectCallback) {
+    getSaveToComputerHandler(downloadProjectCallback) {
         return () => {
             this.props.onRequestCloseFile();
             downloadProjectCallback();
@@ -292,44 +302,44 @@ class MenuBar extends React.Component {
             }
         };
     }
-    handleLanguageMouseUp (e) {
+    handleLanguageMouseUp(e) {
         if (!this.props.languageMenuOpen) {
             this.props.onClickLanguage(e);
         }
     }
-    restoreOptionMessage (deletedItem) {
+    restoreOptionMessage(deletedItem) {
         switch (deletedItem) {
-        case 'Sprite':
-            return (<FormattedMessage
-                defaultMessage="Restore Sprite"
-                description="Menu bar item for restoring the last deleted sprite."
-                id="gui.menuBar.restoreSprite"
-            />);
-        case 'Sound':
-            return (<FormattedMessage
-                defaultMessage="Restore Sound"
-                description="Menu bar item for restoring the last deleted sound."
-                id="gui.menuBar.restoreSound"
-            />);
-        case 'Costume':
-            return (<FormattedMessage
-                defaultMessage="Restore Costume"
-                description="Menu bar item for restoring the last deleted costume."
-                id="gui.menuBar.restoreCostume"
-            />);
-        default: {
-            return (<FormattedMessage
-                defaultMessage="Restore"
-                description="Menu bar item for restoring the last deleted item in its disabled state." /* eslint-disable-line max-len */
-                id="gui.menuBar.restore"
-            />);
-        }
+            case 'Sprite':
+                return (<FormattedMessage
+                    defaultMessage="Restore Sprite"
+                    description="Menu bar item for restoring the last deleted sprite."
+                    id="gui.menuBar.restoreSprite"
+                />);
+            case 'Sound':
+                return (<FormattedMessage
+                    defaultMessage="Restore Sound"
+                    description="Menu bar item for restoring the last deleted sound."
+                    id="gui.menuBar.restoreSound"
+                />);
+            case 'Costume':
+                return (<FormattedMessage
+                    defaultMessage="Restore Costume"
+                    description="Menu bar item for restoring the last deleted costume."
+                    id="gui.menuBar.restoreCostume"
+                />);
+            default: {
+                return (<FormattedMessage
+                    defaultMessage="Restore"
+                    description="Menu bar item for restoring the last deleted item in its disabled state." /* eslint-disable-line max-len */
+                    id="gui.menuBar.restore"
+                />);
+            }
         }
     }
-    handleClickSeeInside () {
+    handleClickSeeInside() {
         this.props.onClickSeeInside();
     }
-    buildAboutMenu (onClickAbout) {
+    buildAboutMenu(onClickAbout) {
         if (!onClickAbout) {
             // hide the button
             return null;
@@ -374,13 +384,13 @@ class MenuBar extends React.Component {
             </div>
         );
     }
-    wrapAboutMenuCallback (callback) {
+    wrapAboutMenuCallback(callback) {
         return () => {
             callback();
             this.props.onRequestCloseAbout();
         };
     }
-    render () {
+    render() {
         const saveNowMessage = (
             <FormattedMessage
                 defaultMessage="Save now"
@@ -504,14 +514,14 @@ class MenuBar extends React.Component {
                                     onRequestClose={this.props.onRequestCloseErrors}
                                 >
                                     <MenuSection>
-                                        <MenuItemLink href="https://scratch.mit.edu/users/GarboMuffin/#comments">
+                                        <MenuItemLink href="https://discord.gg/NZ9MBMYTZh">
                                             <FormattedMessage
                                                 defaultMessage="Some scripts could not be compiled."
                                                 description="Link in error menu"
                                                 id="tw.menuBar.reportError1"
                                             />
                                         </MenuItemLink>
-                                        <MenuItemLink href="https://scratch.mit.edu/users/GarboMuffin/#comments">
+                                        <MenuItemLink href="https://discord.gg/NZ9MBMYTZh">
                                             <FormattedMessage
                                                 defaultMessage="This is a bug. Please report it."
                                                 description="Link in error menu"
@@ -520,7 +530,7 @@ class MenuBar extends React.Component {
                                         </MenuItemLink>
                                     </MenuSection>
                                     <MenuSection>
-                                        {this.props.compileErrors.map(({id, sprite, error}) => (
+                                        {this.props.compileErrors.map(({ id, sprite, error }) => (
                                             <MenuItem key={id}>
                                                 {this.props.intl.formatMessage(twMessages.compileError, {
                                                     sprite,
@@ -558,6 +568,19 @@ class MenuBar extends React.Component {
                                             {newProjectMessage}
                                         </MenuItem>
                                     </MenuSection>
+                                    {this.props.onClickNewWindow && (
+                                        <MenuItem
+                                            isRtl={this.props.isRtl}
+                                            onClick={this.handleClickNewWindow}
+                                        >
+                                            <FormattedMessage
+                                                defaultMessage="New window"
+                                                // eslint-disable-next-line max-len
+                                                description="Part of desktop app. Menu bar item that creates a new window."
+                                                id="tw.menuBar.newWindow"
+                                            />
+                                        </MenuItem>
+                                    )}
                                     {(this.props.canSave || this.props.canCreateCopy || this.props.canRemix) && (
                                         <MenuSection>
                                             {this.props.canSave && (
@@ -588,9 +611,11 @@ class MenuBar extends React.Component {
                                                 {extended.available && (
                                                     <React.Fragment>
                                                         {extended.name !== null && (
+                                                            // eslint-disable-next-line max-len
                                                             <MenuItem onClick={this.getSaveToComputerHandler(extended.saveToLastFile)}>
                                                                 <FormattedMessage
                                                                     defaultMessage="Save to {file}"
+                                                                    // eslint-disable-next-line max-len
                                                                     description="Menu bar item to save project to an existing file on the user's computer"
                                                                     id="tw.saveTo"
                                                                     values={{
@@ -599,30 +624,35 @@ class MenuBar extends React.Component {
                                                                 />
                                                             </MenuItem>
                                                         )}
+                                                        {/* eslint-disable-next-line max-len */}
                                                         <MenuItem onClick={this.getSaveToComputerHandler(extended.saveAsNew)}>
                                                             <FormattedMessage
                                                                 defaultMessage="Save as..."
-                                                                description="Menu bar item to select a new file to save the project as" // eslint-disable-line max-len
+                                                                // eslint-disable-next-line max-len
+                                                                description="Menu bar item to select a new file to save the project as"
                                                                 id="tw.saveAs"
                                                             />
                                                         </MenuItem>
                                                     </React.Fragment>
                                                 )}
-                                                <MenuItem onClick={this.getSaveToComputerHandler(downloadProject)}>
-                                                    {extended.available ? (
-                                                        <FormattedMessage
-                                                            defaultMessage="Save to separate file..."
-                                                            description="Download the project once, without being able to easily save to the same spot"
-                                                            id="tw.oldDownload"
-                                                        />
-                                                    ) : (
-                                                        <FormattedMessage
-                                                            defaultMessage="Save to your computer"
-                                                            description="Menu bar item for downloading a project to your computer" // eslint-disable-line max-len
-                                                            id="gui.menuBar.downloadToComputer"
-                                                        />
-                                                    )}
-                                                </MenuItem>
+                                                {notScratchDesktop() && (
+                                                    <MenuItem onClick={this.getSaveToComputerHandler(downloadProject)}>
+                                                        {extended.available ? (
+                                                            <FormattedMessage
+                                                                defaultMessage="Save to separate file..."
+                                                                // eslint-disable-next-line max-len
+                                                                description="Download the project once, without being able to easily save to the same spot"
+                                                                id="tw.oldDownload"
+                                                            />
+                                                        ) : (
+                                                            <FormattedMessage
+                                                                defaultMessage="Save to your computer"
+                                                                description="Menu bar item for downloading a project to your computer" // eslint-disable-line max-len
+                                                                id="gui.menuBar.downloadToComputer"
+                                                            />
+                                                        )}
+                                                    </MenuItem>
+                                                )}
                                             </React.Fragment>
                                         )}</SB3Downloader>
                                     </MenuSection>
@@ -641,18 +671,13 @@ class MenuBar extends React.Component {
                                         </MenuSection>
                                     )}
                                     <MenuSection>
-                                        <TWRestorePointLoader>{(className, loadRestorePoint) => (
-                                            <MenuItem
-                                                className={className}
-                                                onClick={loadRestorePoint}
-                                            >
-                                                <FormattedMessage
-                                                    defaultMessage="Load restore point"
-                                                    description="Menu bar item for loading a restore point"
-                                                    id="tw.menuBar.loadRestorePoint"
-                                                />
-                                            </MenuItem>
-                                        )}</TWRestorePointLoader>
+                                        <MenuItem onClick={this.handleClickRestorePoints}>
+                                            <FormattedMessage
+                                                defaultMessage="Restore points"
+                                                description="Menu bar item to manage restore points"
+                                                id="tw.menuBar.restorePoints"
+                                            />
+                                        </MenuItem>
                                     </MenuSection>
                                 </MenuBarMenu>
                             </div>
@@ -677,9 +702,9 @@ class MenuBar extends React.Component {
                                 onRequestClose={this.props.onRequestCloseEdit}
                             >
                                 {this.props.isPlayerOnly ? null : (
-                                    <DeletionRestorer>{(handleRestore, {restorable, deletedItem}) => (
+                                    <DeletionRestorer>{(handleRestore, { restorable, deletedItem }) => (
                                         <MenuItem
-                                            className={classNames({[styles.disabled]: !restorable})}
+                                            className={classNames({ [styles.disabled]: !restorable })}
                                             onClick={this.handleRestoreOption(handleRestore)}
                                         >
                                             {this.restoreOptionMessage(deletedItem)}
@@ -687,7 +712,7 @@ class MenuBar extends React.Component {
                                     )}</DeletionRestorer>
                                 )}
                                 <MenuSection>
-                                    <TurboMode>{(toggleTurboMode, {turboMode}) => (
+                                    <TurboMode>{(toggleTurboMode, { turboMode }) => (
                                         <MenuItem onClick={toggleTurboMode}>
                                             {turboMode ? (
                                                 <FormattedMessage
@@ -704,7 +729,7 @@ class MenuBar extends React.Component {
                                             )}
                                         </MenuItem>
                                     )}</TurboMode>
-                                    <FramerateChanger>{(changeFramerate, {framerate}) => (
+                                    <FramerateChanger>{(changeFramerate, { framerate }) => (
                                         <MenuItem onClick={changeFramerate}>
                                             {framerate === 60 ? (
                                                 <FormattedMessage
@@ -730,9 +755,9 @@ class MenuBar extends React.Component {
                                             />
                                         </MenuItem>
                                     )}</ChangeUsername>
-                                    <CloudVariablesToggler>{(toggleCloudVariables, {enabled, canUseCloudVariables}) => (
+                                    <CloudVariablesToggler>{(toggleCloudVariables, { enabled, canUseCloudVariables }) => (
                                         <MenuItem
-                                            className={classNames({[styles.disabled]: !canUseCloudVariables})}
+                                            className={classNames({ [styles.disabled]: !canUseCloudVariables })}
                                             onClick={toggleCloudVariables}
                                         >
                                             {canUseCloudVariables ? (
@@ -762,9 +787,9 @@ class MenuBar extends React.Component {
                                 <MenuSection>
                                     <MenuItem onClick={this.props.onClickSettings}>
                                         <FormattedMessage
-                                            defaultMessage="Advanced Settings"
-                                            description="Menu bar item for advanced settings"
-                                            id="tw.menuBar.moreSettings"
+                                            defaultMessage="Gameplay Settings"
+                                            description="Menu bar item for gameplay settings"
+                                            id="pm.menuBar.moreSettings"
                                         />
                                     </MenuItem>
                                 </MenuSection>
@@ -791,14 +816,24 @@ class MenuBar extends React.Component {
                         >
                             <div>
                                 <FormattedMessage
-                                    defaultMessage="Advanced"
-                                    description="Text for advanced settings menu item"
-                                    id="tw.menuBar.advanced"
+                                    defaultMessage="Settings"
+                                    description="Text for gameplay settings menu item"
+                                    id="pm.menuBar.gameplaySettings"
                                 />
                             </div>
                         </div>
                     </div>
                     <Divider className={classNames(styles.divider)} />
+                    {/* {(this.props.authorUsername && this.props.authorUsername !== this.props.username) ? (
+                        <AuthorInfo
+                            className={styles.authorInfo}
+                            imageUrl={this.props.authorThumbnailUrl}
+                            projectId={this.props.projectId}
+                            // projectTitle={this.props.projectTitle}
+                            userId={this.props.authorId}
+                            username={this.props.authorUsername}
+                        />
+                    ) : null} */}
                     {this.props.canEditTitle ? (
                         <div className={classNames(styles.menuBarItem, styles.growable)}>
                             <MenuBarItemTooltip
@@ -810,16 +845,7 @@ class MenuBar extends React.Component {
                                 />
                             </MenuBarItemTooltip>
                         </div>
-                    ) : ((this.props.authorUsername && this.props.authorUsername !== this.props.username) ? (
-                        <AuthorInfo
-                            className={styles.authorInfo}
-                            imageUrl={this.props.authorThumbnailUrl}
-                            projectId={this.props.projectId}
-                            projectTitle={this.props.projectTitle}
-                            userId={this.props.authorId}
-                            username={this.props.authorUsername}
-                        />
-                    ) : null)}
+                    ) : null}
                     <div className={classNames(styles.menuBarItem)}>
                         {this.props.canRemix ? remixButton : []}
                     </div>
@@ -852,9 +878,8 @@ class MenuBar extends React.Component {
                             />
                         ) : []))}
                     </div>
-                    {/* tw: add a feedback button */}
                     <div className={styles.menuBarItem}>
-                        {this.props.isShowingProject && this.props.canEditTitle && (!window.location.href.includes('#')) ?
+                        {this.props.isShowingProject && this.props.canEditTitle ?
                             (<ShareButton
                                 className={styles.menuBarButton}
                                 isShared={this.props.isShared}
@@ -864,16 +889,15 @@ class MenuBar extends React.Component {
                     <div className={styles.menuBarItem}>
                         <a
                             className={styles.feedbackLink}
-                            href="https://snail-ide.vercel.app/"
+                            href="https://snail-ide.vercel.app"
                             rel="noopener noreferrer"
                             target="_blank"
                         >
-                            {/* todo: icon */}
                             <Button className={styles.feedbackButton}>
                                 <FormattedMessage
                                     defaultMessage="Back to Home"
-                                    description="Button to your moms house"
-                                    id="tw.feedbackButton"
+                                    description="Button to go back to the home page"
+                                    id="pm.backToHomeButton"
                                 />
                             </Button>
                         </a>
@@ -943,12 +967,14 @@ MenuBar.propTypes = {
     onClickAddonSettings: PropTypes.func,
     onClickTheme: PropTypes.func,
     onClickPackager: PropTypes.func,
+    onClickRestorePoints: PropTypes.func,
     onClickEdit: PropTypes.func,
     onClickFile: PropTypes.func,
     onClickLanguage: PropTypes.func,
     onClickLogin: PropTypes.func,
     onClickLogo: PropTypes.func,
     onClickNew: PropTypes.func,
+    onClickNewWindow: PropTypes.func,
     onClickRemix: PropTypes.func,
     onClickSave: PropTypes.func,
     onClickSaveAsCopy: PropTypes.func,
@@ -1041,6 +1067,7 @@ const mapDispatchToProps = dispatch => ({
     onClickRemix: () => dispatch(remixProject()),
     onClickSave: () => dispatch(manualUpdateProject()),
     onClickSaveAsCopy: () => dispatch(saveProjectAsCopy()),
+    onClickRestorePoints: () => dispatch(openRestorePointModal()),
     onClickSettings: () => {
         dispatch(openSettingsModal());
         dispatch(closeEditMenu());
@@ -1055,4 +1082,4 @@ export default compose(
         mapStateToProps,
         mapDispatchToProps
     )
-)(MenuBar);
+)(MenuBar);
\ No newline at end of file
diff --git a/src/components/stage-header/stage-header.jsx b/src/components/stage-header/stage-header.jsx
index 38ecccd3b95..bd71852c619 100644
--- a/src/components/stage-header/stage-header.jsx
+++ b/src/components/stage-header/stage-header.jsx
@@ -52,9 +52,9 @@ const messages = defineMessages({
         id: 'gui.stageHeader.fullscreenControl'
     },
     openSettingsMessage: {
-        defaultMessage: 'Open advanced settings',
-        description: 'Button to open advanced settings in embeds',
-        id: 'tw.openAdvanced'
+        defaultMessage: 'Open gameplay settings',
+        description: 'Button to open gameplay settings in embeds',
+        id: 'pm.openGameplay'
     }
 });
 
@@ -260,4 +260,4 @@ StageHeaderComponent.defaultProps = {
 
 export default injectIntl(connect(
     mapStateToProps
-)(StageHeaderComponent));
+)(StageHeaderComponent));
\ No newline at end of file
diff --git a/src/components/tw-settings-modal/settings-modal.css b/src/components/tw-settings-modal/settings-modal.css
index e9188e43d09..f104971a59a 100644
--- a/src/components/tw-settings-modal/settings-modal.css
+++ b/src/components/tw-settings-modal/settings-modal.css
@@ -54,6 +54,9 @@
     flex-direction: row;
     align-items: center;
 }
+.label-unset-height {
+    height: initial;
+}
 
 .setting table {
     border-collapse: collapse;
@@ -84,11 +87,46 @@
     background-image: url("./help-white.svg");
 }
 
+.custom-stage-size {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    height: initial;
+}
+.custom-stage-size-container {
+    display: flex;
+    align-items: center;
+}
 .custom-stage-size > * {
     margin-right: 0.5rem;
 }
+.custom-stage-size-button {
+    margin: 8px;
+    background: white;
+    border-radius: 10px;
+    font-size: 40px;
+    width: 168px;
+    height: 126px;
+    border: 4px solid rgba(0, 0, 0, 0.1);
+    outline: 4px white solid;
+}
+[theme="dark"] .custom-stage-size-button {
+    outline-color: $ui-primary;
+    background: $ui-primary;
+    border-color: rgba(255, 255, 255, 0.1);
+}
+.custom-stage-size-button[data-widescreen="true"] {
+    width: 224px;
+}
+.custom-stage-size-button[data-selected="true"] {
+    border-color: $motion-primary;
+}
+.custom-stage-size-button:active {
+    border-color: $motion-transparent;
+}
 .custom-stage-size-input {
     width: 80px;
+    margin: 3px 8px;
 }
 
 .info {
@@ -133,4 +171,4 @@
 }
 [theme="dark"] .warning {
     background: rgb(114, 102, 0);
-}
+}
\ No newline at end of file
diff --git a/src/components/tw-settings-modal/settings-modal.jsx b/src/components/tw-settings-modal/settings-modal.jsx
index ada0215d3c0..76ece8d0b78 100644
--- a/src/components/tw-settings-modal/settings-modal.jsx
+++ b/src/components/tw-settings-modal/settings-modal.jsx
@@ -17,9 +17,9 @@ const BufferedInput = BufferedInputHOC(Input);
 
 const messages = defineMessages({
     title: {
-        defaultMessage: 'Advanced Settings',
+        defaultMessage: 'Settings',
         description: 'Title of settings modal',
-        id: 'tw.settingsModal.title'
+        id: 'pm.settingsModal.title'
     },
     help: {
         defaultMessage: 'Click for help',
@@ -70,7 +70,9 @@ class UnwrappedSetting extends React.Component {
                     [styles.active]: this.props.active
                 })}
             >
-                <div className={styles.label}>
+                <div className={classNames(styles.label, {
+                    [styles.labelUnsetHeight]: this.props.unsetHeight === true
+                })}>
                     {this.props.primary}
                     <button
                         className={styles.helpIcon}
@@ -121,8 +123,6 @@ BooleanSetting.propTypes = {
     label: PropTypes.node.isRequired
 };
 
-/*
-dd back: nohqpen
 const HighQualityPen = props => (
     <BooleanSetting
         {...props}
@@ -144,7 +144,6 @@ const HighQualityPen = props => (
         slug="high-quality-pen"
     />
 );
-*/
 
 const CustomFPS = props => (
     <BooleanSetting
@@ -301,36 +300,62 @@ const CustomStageSize = ({
     stageWidth,
     onStageWidthChange,
     stageHeight,
-    onStageHeightChange
+    onStageHeightChange,
+    onStagePresetUsed
 }) => (
     <Setting
         active={customStageSizeEnabled}
+        unsetHeight={true}
         primary={(
             <div className={classNames(styles.label, styles.customStageSize)}>
                 <FormattedMessage
-                    defaultMessage="Custom Stage Size:"
-                    description="Custom Stage Size option"
-                    id="tw.settingsModal.customStageSize"
-                />
-                <BufferedInput
-                    value={stageWidth}
-                    onSubmit={onStageWidthChange}
-                    className={styles.customStageSizeInput}
-                    type="number"
-                    min="0"
-                    max="1024"
-                    step="1"
-                />
-                <span>{'×'}</span>
-                <BufferedInput
-                    value={stageHeight}
-                    onSubmit={onStageHeightChange}
-                    className={styles.customStageSizeInput}
-                    type="number"
-                    min="0"
-                    max="1024"
-                    step="1"
+                    defaultMessage="Stage Size:"
+                    description="Stage Size option"
+                    id="pm.settingsModal.stageSize"
                 />
+                <div>
+                    <button
+                        className={styles.customStageSizeButton}
+                        data-selected={stageWidth === 480 && stageHeight === 360}
+                        onClick={() => onStagePresetUsed(false)}
+                    >
+                        4:3
+                    </button>
+                    <button
+                        className={styles.customStageSizeButton}
+                        data-selected={stageWidth === 640 && stageHeight === 360}
+                        data-widescreen={true}
+                        onClick={() => onStagePresetUsed(true)}
+                    >
+                        16:9
+                    </button>
+                </div>
+                <div className={styles.customStageSizeContainer}>
+                    <FormattedMessage
+                        defaultMessage="Custom Stage Size:"
+                        description="Custom Stage Size option"
+                        id="tw.settingsModal.customStageSize"
+                    />
+                    <BufferedInput
+                        value={stageWidth}
+                        onSubmit={onStageWidthChange}
+                        className={styles.customStageSizeInput}
+                        type="number"
+                        min="0"
+                        max="1024"
+                        step="1"
+                    />
+                    <span>{'×'}</span>
+                    <BufferedInput
+                        value={stageHeight}
+                        onSubmit={onStageHeightChange}
+                        className={styles.customStageSizeInput}
+                        type="number"
+                        min="0"
+                        max="1024"
+                        step="1"
+                    />
+                </div>
             </div>
         )}
         secondary={
@@ -362,7 +387,8 @@ CustomStageSize.propTypes = {
     stageWidth: PropTypes.number,
     onStageWidthChange: PropTypes.func,
     stageHeight: PropTypes.number,
-    onStageHeightChange: PropTypes.func
+    onStageHeightChange: PropTypes.func,
+    onStagePresetUsed: PropTypes.func
 };
 
 const StoreProjectOptions = ({ onStoreProjectOptions }) => (
@@ -406,16 +432,21 @@ Header.propTypes = {
 const SettingsModalComponent = props => (
     <Modal
         className={styles.modalContent}
-        onRequestClose={props.onClose}
+        onRequestClose={(...args) => {
+            if (!props.isEmbedded) {
+                props.onStoreProjectOptions();
+            }
+            props.onClose(...args)
+        }}
         contentLabel={props.intl.formatMessage(messages.title)}
         id="settingsModal"
     >
         <Box className={styles.body}>
             <Header>
                 <FormattedMessage
-                    defaultMessage="Featured"
+                    defaultMessage="Gameplay"
                     description="Settings modal section"
-                    id="tw.settingsModal.featured"
+                    id="pm.settingsModal.gameplay"
                 />
             </Header>
             <CustomFPS
@@ -427,13 +458,10 @@ const SettingsModalComponent = props => (
                 value={props.interpolation}
                 onChange={props.onInterpolationChange}
             />
-            {/*
-            add back: nohqpen
             <HighQualityPen
                 value={props.highQualityPen}
                 onChange={props.onHighQualityPenChange}
             />
-            */}
             <WarpTimer
                 value={props.warpTimer}
                 onChange={props.onWarpTimerChange}
@@ -459,9 +487,9 @@ const SettingsModalComponent = props => (
             />
             <Header>
                 <FormattedMessage
-                    defaultMessage="Danger Zone"
+                    defaultMessage="Screen Resolution"
                     description="Settings modal section"
-                    id="tw.settingsModal.dangerZone"
+                    id="pm.settingsModal.screenResolution"
                 />
             </Header>
             {!props.isEmbedded && (
@@ -469,11 +497,11 @@ const SettingsModalComponent = props => (
                     {...props}
                 />
             )}
-            {!props.isEmbedded && (
+            {/* {!props.isEmbedded && (
                 <StoreProjectOptions
                     {...props}
                 />
-            )}
+            )} */}
         </Box>
     </Modal>
 );
@@ -501,4 +529,4 @@ SettingsModalComponent.propTypes = {
     onDisableCompilerChange: PropTypes.func
 };
 
-export default injectIntl(SettingsModalComponent);
+export default injectIntl(SettingsModalComponent);
\ No newline at end of file
diff --git a/src/containers/tw-settings-modal.jsx b/src/containers/tw-settings-modal.jsx
index 8d9bd0a8f52..d84404eea4d 100644
--- a/src/containers/tw-settings-modal.jsx
+++ b/src/containers/tw-settings-modal.jsx
@@ -21,10 +21,7 @@ class UsernameModal extends React.Component {
         bindAll(this, [
             'handleFramerateChange',
             'handleCustomizeFramerate',
-            /*
-            add back: nohqpen
             'handleHighQualityPenChange',
-            */
             'handleInterpolationChange',
             'handleInfiniteClonesChange',
             'handleRemoveFencingChange',
@@ -32,6 +29,7 @@ class UsernameModal extends React.Component {
             'handleWarpTimerChange',
             'handleStageWidthChange',
             'handleStageHeightChange',
+            'handleStagePresetUsed',
             'handleDisableCompilerChange',
             'handleStoreProjectOptions'
         ]);
@@ -39,20 +37,18 @@ class UsernameModal extends React.Component {
     handleFramerateChange (e) {
         this.props.vm.setFramerate(e.target.checked ? 60 : 30);
     }
-    handleCustomizeFramerate () {
+    async handleCustomizeFramerate () {
+        // prompt() returns Promise in desktop app
         // eslint-disable-next-line no-alert
-        const newFramerate = prompt(this.props.intl.formatMessage(messages.newFramerate), this.props.framerate);
+        const newFramerate = await prompt(this.props.intl.formatMessage(messages.newFramerate), this.props.framerate);
         const parsed = parseFloat(newFramerate);
         if (isFinite(parsed)) {
             this.props.vm.setFramerate(parsed);
         }
     }
-    /*
-    add back: nohqpen
     handleHighQualityPenChange (e) {
         this.props.vm.renderer.setUseHighQualityRender(e.target.checked);
     }
-    */
     handleInterpolationChange (e) {
         this.props.vm.setInterpolation(e.target.checked);
     }
@@ -87,6 +83,13 @@ class UsernameModal extends React.Component {
     handleStageHeightChange (value) {
         this.props.vm.setStageSize(this.props.customStageSize.width, value);
     }
+    handleStagePresetUsed (widescreen) {
+        if (widescreen) {
+            this.props.vm.setStageSize(640, 360);
+            return;
+        }
+        this.props.vm.setStageSize(480, 360);
+    }
     handleStoreProjectOptions () {
         this.props.vm.storeProjectOptions();
     }
@@ -111,6 +114,7 @@ class UsernameModal extends React.Component {
                 onWarpTimerChange={this.handleWarpTimerChange}
                 onStageWidthChange={this.handleStageWidthChange}
                 onStageHeightChange={this.handleStageHeightChange}
+                onStagePresetUsed={this.handleStagePresetUsed}
                 onDisableCompilerChange={this.handleDisableCompilerChange}
                 stageWidth={this.props.customStageSize.width}
                 stageHeight={this.props.customStageSize.height}
@@ -175,4 +179,4 @@ const mapDispatchToProps = dispatch => ({
 export default injectIntl(connect(
     mapStateToProps,
     mapDispatchToProps
-)(UsernameModal));
+)(UsernameModal));
\ No newline at end of file
diff --git a/src/playground/render-interface.jsx b/src/playground/render-interface.jsx
index 87c853842f7..88de875457f 100644
--- a/src/playground/render-interface.jsx
+++ b/src/playground/render-interface.jsx
@@ -205,13 +205,6 @@ const Footer = () => (
                             id="tw.examples"
                         />
                     </a>
-                    <a href={`https://snail-ide.vercel.app/report?type=project&id=${projectId}`}>
-                        <FormattedMessage
-                            defaultMessage="Report this Projoct"
-                            description="Report the Project"
-                            id="tw.report"
-                        />
-                    </a>
                     <a href="https://snail-ide.js.org/editor.html?livetests">
                         <FormattedMessage
                             defaultMessage="Live Tests"