diff --git a/README.md b/README.md
index 592fa389f..f6d86f30b 100644
--- a/README.md
+++ b/README.md
@@ -210,4 +210,4 @@ BSD 3-clause
 
 [Documentation]: <https://grapesjs.com/docs/>
 [API-Reference]: <https://grapesjs.com/docs/api/>
-[CMS]: <https://it.wikipedia.org/wiki/Content_management_system>
+[CMS]: <https://en.wikipedia.org/wiki/Content_management_system>
diff --git a/docs/api.js b/docs/api.js
index 5455c3872..2b9e636e8 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -11,7 +11,7 @@ async function generateDocs () {
   log('Start API Reference generation...');
 
   await Promise.all([
-    ['editor/index.js', 'editor.md'],
+    ['editor/index.ts', 'editor.md'],
     ['asset_manager/index.js', 'assets.md'],
     ['asset_manager/model/Asset.js', 'asset.md'],
     ['block_manager/index.js', 'block_manager.md'],
@@ -31,9 +31,9 @@ async function generateDocs () {
     ['storage_manager/index.js', 'storage_manager.md'],
     ['device_manager/index.js', 'device_manager.md'],
     ['device_manager/model/Device.js', 'device.md'],
-    ['selector_manager/index.js', 'selector_manager.md'],
-    ['selector_manager/model/Selector.js', 'selector.md'],
-    ['selector_manager/model/State.js', 'state.md'],
+    ['selector_manager/index.ts', 'selector_manager.md'],
+    ['selector_manager/model/Selector.ts', 'selector.md'],
+    ['selector_manager/model/State.ts', 'state.md'],
     ['css_composer/index.js', 'css_composer.md'],
     ['css_composer/model/CssRule.js', 'css_rule.md'],
     ['modal_dialog/index.js', 'modal_dialog.md'],
@@ -41,10 +41,10 @@ async function generateDocs () {
     ['keymaps/index.js', 'keymaps.md'],
     ['undo_manager/index.js', 'undo_manager.md'],
     ['canvas/index.js', 'canvas.md'],
-    ['canvas/model/Frame.js', 'frame.md'],
+    ['canvas/model/Frame.ts', 'frame.md'],
     ['i18n/index.js', 'i18n.md'],
-    ['pages/index.js', 'pages.md'],
-    ['pages/model/Page.js', 'page.md'],
+    ['pages/index.ts', 'pages.md'],
+    ['pages/model/Page.ts', 'page.md'],
     ['parser/index.js', 'parser.md'],
   ].map(async (file) =>
     documentation.build([`${srcRoot}/${file[0]}`], { shallow: true })
diff --git a/docs/getting-started.md b/docs/getting-started.md
index f0f1af10c..c0555e60b 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -8,11 +8,11 @@ meta:
 
 # Getting Started
 
-This is a step-by-step guide for anyone who wants to create their own builder with GrapesJS. This is not a comprehensive guide, just a concise overview of most common modules. Follow along to create a page builder from scratch. Skip to the end of this page to see the [final result](#final-result)
+This is a step-by-step guide for anyone who wants to create their own builder with GrapesJS. This is not a comprehensive guide, just a concise overview of most common modules. Follow along to create a page builder from scratch. Skip to the end of this page to see the [final result](#final-result).
 
 ## Import the library
 
-Before you start using GrapesJS, you'll have to import it. Let's import the latest version
+Before you start using GrapesJS, you'll have to import it. Let's import the latest version:
 
 ```html
 <link rel="stylesheet" href="//unpkg.com/grapesjs/dist/css/grapes.min.css">
@@ -100,7 +100,7 @@ const editor = grapesjs.init({
  <DemoBasicBlocks/>
 </Demo>
 
-As you can see we add our blocks via the initial configuration. Obviously there might be a case in which you would like to add them dynamically, in this case you have to use the [Block Manager API](api/block_manager.html)
+As you can see we add our blocks via the initial configuration. Obviously there might be a case in which you would like to add them dynamically, in this case you have to use the [Block Manager API](api/block_manager.html):
 
 ```js
 editor.BlockManager.add('my-block-id', {
@@ -110,16 +110,16 @@ editor.BlockManager.add('my-block-id', {
 })
 ```
 ::: tip
-If you want to learn more about blocks we suggest to read its dedicated article: [Block Manager Module](modules/Blocks.html)
+If you want to learn more about blocks we suggest to read its dedicated article: [Block Manager Module](modules/Blocks.html).
 :::
 
 ## Define Components
 Technically, once you drop your HTML block inside the canvas each element of the content is transformed into a GrapesJS Component. A GrapesJS Component is an object containing information about how the element is rendered in the canvas (managed in the View) and how it might look its final code (created by the properties in the Model). Generally, all Model properties are reflected in the View. Therefore, if you add a new attribute to the model, it will be available in the export code (which we will learn more about later), and the element you see in the canvas will be updated with new attributes.
 This isn't totally out of the ordinary, but the unique thing about Components that you can create a totally decoupled View. This means you can show the user whatever you desire regardless of what is in the Model. For example, by dragging a placeholder text you can fetch and show instead a dynamic content. If you want to learn more about Custom Components, you should check out [Component Manager Module](modules/Components.html).
 
-GrapesJS comes with a few [built-in Components](modules/Components.html#built-in-component-types) that enable different features once rendered in the canvas. For example, by double clicking on an image component you will see the default [Asset Manager](modules/Assets.html), which you can customize or integrate you own. By double clicking on the text component you're able to edit it via the built-in Rich Text Editor, which is also customization and [replaceable](guides/Replace-Rich-Text-Editor.html).
+GrapesJS comes with a few [built-in Components](modules/Components.html#built-in-component-types) that enable different features once rendered in the canvas. For example, by double clicking on an image component you will see the default [Asset Manager](modules/Assets.html), which you can customize or integrate you own. By double clicking on the text component you're able to edit it via the built-in Rich Text Editor, which is also customizable and [replaceable](guides/Replace-Rich-Text-Editor.html).
 
-As we have seen before you can create Blocks directly as Components
+As we have seen before you can create Blocks directly as Components:
 ```js
 editor.BlockManager.add('my-block-id', {
   // ...
@@ -142,10 +142,10 @@ editor.BlockManager.add('my-block-id', {
 })
 ```
 ::: tip
-Check out the [Components API](api/components.html) to learn how to interact with components dynamically
+Check out the [Components API](api/components.html) to learn how to interact with components dynamically.
 :::
 
-An example on how to select some inner component and replace its children with new contents
+An example of how to select some inner component and replace its children with new contents:
 
 ```js
 // The wrapper is the root Component
@@ -239,12 +239,12 @@ editor.on('abort:export-template', () => console.log('Command aborted'));
 ```
 
 ::: tip
-Check out the [Panels API](api/panels.html) to see all the available methods
+Check out the [Panels API](api/panels.html) to see all the available methods.
 :::
 
 
 ## Layers
-Another utility tool you might find useful when working with web elements is the layer manger. It's a tree overview of the structure nodes and enables you to manage it easier. To enable it you just have to specify where you want to render it
+Another utility tool you might find useful when working with web elements is the layer manger. It's a tree overview of the structure nodes and enables you to manage it easier. To enable it you just have to specify where you want to render it.
 
 ```html{4,5,6,7,8,9,10,11}
 <div class="panel__top">
@@ -296,7 +296,7 @@ const editor = grapesjs.init({
 ## Style Manager
 Once you have defined the structure of the template the next step is the ability to style it. To meet this need GrapesJS includes the Style Manager module which is composed by CSS style properties and sectors. To make it more clear, let's see how to define a basic set.
 
-Let's start by adding one more panel inside the `panel__right` and another one in `panel__top` which will contain a Layer/Style Manager switcher
+Let's start by adding one more panel inside the `panel__right` and another one in `panel__top` which will contain a Layer/Style Manager switcher:
 
 ```html{3,8}
 <div class="panel__top">
@@ -424,10 +424,10 @@ editor.Commands.add('show-styles', {
   <DemoStyle/>
 </Demo>
 
-Inside Style Manager definition we use `buildProps` which helps us create common properties from [available built-in objects](modules/Style-manager.html#built-in-properties) then in `properties` we can override same objects (eg. passing another `name` to change the label) identified by `property` name. As you can see from `custom-prop` example it's a matter of defining the CSS `property` and the input `type`. We suggest to check a more complete example of Style Manager properties usage from the [webpage preset demo](https://github.com/artf/grapesjs/blob/gh-pages/demo.html#L1000)
+Inside Style Manager definition we use `buildProps` which helps us create common properties from [available built-in objects](modules/Style-manager.html#built-in-properties) then in `properties` we can override same objects (eg. passing another `name` to change the label) identified by `property` name. As you can see from `custom-prop` example it's a matter of defining the CSS `property` and the input `type`. We suggest to check a more complete example of Style Manager properties usage from the [webpage preset demo](https://github.com/artf/grapesjs/blob/gh-pages/demo.html#L1000).
 
 ::: tip
-Check the [Style Manager API](api/panels.html) to see how to update sectors and properties dynamically
+Check the [Style Manager API](api/panels.html) to see how to update sectors and properties dynamically.
 :::
 
 <!--
@@ -440,7 +440,7 @@ Each component can also indicate what to style and what not.
 ## Traits
 Most of the time you would style your components and place them somewhere in the structure, but sometimes your components might need custom attributes or even custom behaviors and for this need you can make use of traits. Traits are commonly used to update HTML element attributes (eg. `placeholder` for inputs or `alt` for images), but you can also define your own custom traits. Access the selected Component model and do whatever you want. For this guide, we going to show you how to render available traits, for more details on how to extend them we suggest you read the [Trait Manager Module page](modules/Traits.html).
 
-Let's create a new container for traits. Tell the editor where to render it and update the sidebar switcher
+Let's create a new container for traits. Tell the editor where to render it and update the sidebar switcher:
 
 ```html{5}
 ...
@@ -501,7 +501,7 @@ editor.Commands.add('show-traits', {
 Now if you switch to the Trait panel and select one of the inner components you should see its default traits.
 
 ## Responsive templates
-GrapesJS implements a module which allows you to work with responsive templates easily. Let's see how to define different devices and a button for device switching
+GrapesJS implements a module which allows you to work with responsive templates easily. Let's see how to define different devices and a button for device switching:
 
 ```html{3}
 <div class="panel__top">
@@ -597,13 +597,13 @@ editor.setDevice('Mobile');
 ```
 
 ::: tip
-Check out the [Device Manager API](api/device_manager.html) to see all the available methods
+Check out the [Device Manager API](api/device_manager.html) to see all the available methods.
 :::
 
 ## Store & load data
 Once you have finished with defining your builder interface the next step would be to setup the storing and loading process.
 GrapesJS implements 2 simple type of storages inside its Storage Manager: The local (by using `localStorage`, active by default) and the remote one. Those are enough to cover most of the cases, but it's also possible to add new implementations ([grapesjs-indexeddb](https://github.com/artf/grapesjs-indexeddb) is a good example).
-Let's see how the default options work
+Let's see how the default options work:
 
 ```js
 grapesjs.init({
@@ -624,7 +624,7 @@ grapesjs.init({
 
 It is worth noting that the default `id` parameter adds a prefix for all keys to store. If you check the `localStorage` inside the devtool panel you'll see something like `{ 'gjs-components': '....' ...}` this way it lessens the risk of collisions.
 
-Let's look at the configuration required to setup the remote storage
+Let's look at the configuration required to setup the remote storage:
 
 ```js
 grapesjs.init({
@@ -640,7 +640,7 @@ grapesjs.init({
 });
 ```
 As you might noticed, we've left some default options unchanged: Increased changes necessary for autosave triggering and passed remote endpoints.
-If you prefer you could also disable the autosaving and you can do so using a custom command
+If you prefer you could also disable the autosaving and you can do so using a custom command:
 
 ```js
 // ...
@@ -664,10 +664,10 @@ If you prefer you could also disable the autosaving and you can do so using a cu
 // ...
 ```
 
-To get a better overview of the Storage Manager and how you should store/load the template, or how to define new storages you should read the [Storage Manager Module](modules/Storage.html) page
+To get a better overview of the Storage Manager and how you should store/load the template, or how to define new storages you should read the [Storage Manager Module](modules/Storage.html) page.
 
 ## Theming
-One last step that might actually improve a lot your editor personality is how it's look visually. To achieve an easy theming we have adapted an atomic design for this purpose. To customize the main palette of colors all you have to do is to change few CSS rules. Alternatively if you include GrapesJS styles via SCSS you can make use of its [internal variables](https://github.com/artf/grapesjs/blob/dev/src/styles/scss/_gjs_variables.scss) and declare your variables before the import
+One last step that might actually improve a lot your editor personality is how it looks visually. To achieve an easy theming we have adapted an atomic design for this purpose. To customize the main palette of colors all you have to do is to change few CSS rules. Alternatively if you include GrapesJS styles via SCSS you can make use of its [internal variables](https://github.com/artf/grapesjs/blob/dev/src/styles/scss/_gjs_variables.scss) and declare your variables before the import:
 
 ```scss
 // Put your variables before the GrapesJS style import
@@ -684,7 +684,7 @@ $quaternaryColor: #d278c9;
 ```
 
 In case of a simple CSS you'll have to put your rules after the GrapesJS styles.
-To complete our builder let's customize its color palette and to make it more visually "readable" we can replace all button labels with SVG icons
+To complete our builder let's customize its color palette and to make it more visually "readable" we can replace all button labels with SVG icons:
 
 ```css
 /* We can remove the border we've set at the beginnig */
@@ -716,7 +716,7 @@ To complete our builder let's customize its color palette and to make it more vi
 }
 ```
 
-and here is our final result
+And here is our final result:
 
 <Demo id="final-result">
   <DemoTheme/>
diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js
index be8c8b737..e2c20053b 100644
--- a/src/asset_manager/index.js
+++ b/src/asset_manager/index.js
@@ -36,8 +36,6 @@
  * * [getAll](#getall)
  * * [getAllVisible](#getallvisible)
  * * [remove](#remove)
- * * [store](#store)
- * * [load](#load)
  * * [getContainer](#getcontainer)
  *
  * [Asset]: asset.html
diff --git a/src/canvas/model/Frame.ts b/src/canvas/model/Frame.ts
index b3e9824f5..82ea2dfc6 100644
--- a/src/canvas/model/Frame.ts
+++ b/src/canvas/model/Frame.ts
@@ -36,6 +36,9 @@ export default class Frame extends Model {
   em: EditorModel;
   view?: FrameView;
 
+  /**
+   * @hideconstructor
+   */
   constructor(props: any, opts: any) {
     super(props);
     const { em } = opts;
diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js
index dff267953..fde7eb414 100644
--- a/src/canvas/view/FrameView.js
+++ b/src/canvas/view/FrameView.js
@@ -186,8 +186,7 @@ export default class FrameView extends View {
       const { lastClientY } = this;
       const canvas = this.em.get('Canvas');
       const win = this.getWindow();
-      const body = this.getBody();
-      const actualTop = body.scrollTop;
+      const actualTop = win.pageYOffset;
       const clientY = lastClientY || 0;
       const limitTop = canvas.getConfig().autoscrollLimit;
       const limitBottom = this.getRect().height - limitTop;
diff --git a/src/dom_components/index.ts b/src/dom_components/index.ts
index b4ac38f7b..307137574 100644
--- a/src/dom_components/index.ts
+++ b/src/dom_components/index.ts
@@ -44,8 +44,6 @@
  * * [getComponents](#getcomponents)
  * * [addComponent](#addcomponent)
  * * [clear](#clear)
- * * [load](#load)
- * * [store](#store)
  * * [addType](#addtype)
  * * [getType](#gettype)
  * * [getTypes](#gettypes)
diff --git a/src/editor/index.ts b/src/editor/index.ts
index 42dfd7627..c7c7edb49 100644
--- a/src/editor/index.ts
+++ b/src/editor/index.ts
@@ -217,7 +217,10 @@ export default class EditorModule implements IBaseModule<typeof defaults> {
     return this.em.get('DeviceManager');
   }
 
-  //@deprecated
+  /**
+   * Returns configuration object
+   * @returns {any} Returns the configuration object or the value of the specified property
+   */
   getConfig(prop?: string) {
     const config = this.config;
     //@ts-ignore
diff --git a/src/pages/index.ts b/src/pages/index.ts
index ab0d72ddf..a6ccb4bc4 100644
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -85,6 +85,16 @@ export default class PageManager extends ItemManagerModule<Config, Pages> {
   }
 
   model: Model;
+
+  /**
+   * Get all pages
+   * @name getAll
+   * @function
+   * @returns {Array<[Page]>}
+   * @example
+   * const arrayOfPages = pageManager.getAll();
+   */
+
   /**
    * Initialize module
    * @param {Object} config Configurations
diff --git a/src/selector_manager/index.ts b/src/selector_manager/index.ts
index f70a47712..617350775 100644
--- a/src/selector_manager/index.ts
+++ b/src/selector_manager/index.ts
@@ -200,7 +200,7 @@ export default class SelectorManager extends Module {
     return this;
   }
 
-  addSelector(name: string | { name?: string; label?: string }, opts = {}, cOpts = {}): Selector {
+  addSelector(name: string | { name?: string; label?: string } | Selector, opts = {}, cOpts = {}): Selector {
     let props: any = { ...opts };
 
     if (isObject(name)) {
@@ -227,7 +227,8 @@ export default class SelectorManager extends Module {
     const selector = cname ? this.get(cname, props.type) : all.where(props)[0];
 
     if (!selector) {
-      return all.add(new Selector(props, { ...cOpts, config, em }));
+      const selModel = props instanceof Selector ? props : new Selector(props, { ...cOpts, config, em });
+      return all.add(selModel, cOpts);
     }
 
     return selector;
diff --git a/src/selector_manager/model/Selector.ts b/src/selector_manager/model/Selector.ts
index 3abb8da8b..2bb937c48 100644
--- a/src/selector_manager/model/Selector.ts
+++ b/src/selector_manager/model/Selector.ts
@@ -33,6 +33,9 @@ export default class Selector extends Model {
 
   em: EditorModel;
 
+  /**
+   * @hideconstructor
+   */
   constructor(props: any, opts: any = {}) {
     super(props, opts);
     const { config = {} } = opts;
@@ -166,7 +169,7 @@ export default class Selector extends Model {
    * Escape string
    * @param {string} name
    * @return {string}
-   * @public
+   * @private
    */
   static escapeName(name: string) {
     return `${name}`.trim().replace(/([^a-z0-9\w-\:]+)/gi, '-');
diff --git a/test/specs/dom_components/index.js b/test/specs/dom_components/index.js
index eacc81924..9b66f3b0c 100644
--- a/test/specs/dom_components/index.js
+++ b/test/specs/dom_components/index.js
@@ -48,7 +48,7 @@ describe('DOM Components', () => {
       em = new Editor({
         avoidInlineStyle: 1,
       });
-      em.get('PageManager').onLoad();
+      em.loadOnStart();
       config = {
         em,
         storeWrapper: 1,
@@ -235,5 +235,38 @@ describe('DOM Components', () => {
       expect(comp.get('type')).toBe(id);
       expect(comp.get('editable')).toBe(1);
     });
+
+    test('Remove and undo component with styles', done => {
+      const id = 'idtest2';
+      const um = em.get('UndoManager');
+      const cc = em.get('CssComposer');
+      const component = obj.addComponent(`
+      <div id="${id}" style="color:red; padding: 50px 100px">Text</div>
+      <style>
+        #${id} { background-color: red }
+      </style>`);
+      obj.getComponents().first().addStyle({ margin: '10px' });
+      const rule = cc.getAll().at(0);
+      const css = `#${id}{background-color:red;margin:10px;color:red;padding:50px 100px;}`;
+      expect(rule.toCSS()).toEqual(css);
+
+      setTimeout(() => {
+        // Undo is committed now
+        component.remove();
+        expect(obj.getComponents().length).toBe(0);
+        expect(cc.getAll().length).toBe(0);
+        um.undo();
+
+        expect(obj.getComponents().length).toBe(1);
+        expect(cc.getAll().length).toBe(1);
+        expect(obj.getComponents().at(0)).toBe(component);
+        expect(cc.getAll().at(0)).toBe(rule);
+
+        expect(em.getHtml({ component })).toEqual(`<div id="${id}">Text</div>`);
+        expect(rule.toCSS()).toEqual(css);
+
+        done();
+      });
+    });
   });
 });
diff --git a/test/specs/style_manager/view/PropertyColorView.js b/test/specs/style_manager/view/PropertyColorView.js
index 65ca0493c..8769e8583 100644
--- a/test/specs/style_manager/view/PropertyColorView.js
+++ b/test/specs/style_manager/view/PropertyColorView.js
@@ -89,7 +89,7 @@ describe('PropertyColorView', () => {
     setTimeout(() => {
       expect(view.getInputEl().value).toEqual(propValue);
       done();
-    }, 11);
+    }, 15);
   });
 
   describe('Init property', () => {