diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 724b8dbc0..a7a21b722 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -2,7 +2,7 @@
   "@@locale": "en",
   "bold": "Bold",
   "@bold": {},
-  "bulletedList": "Bulleted List",
+  "bulletedList": "Bulleted list",
   "@bulletedList": {},
   "checkbox": "Checkbox",
   "@checkbox": {},
@@ -24,7 +24,7 @@
   "@italic": {},
   "link": "Link",
   "@link": {},
-  "numberedList": "Numbered List",
+  "numberedList": "Numbered list",
   "@numberedList": {},
   "quote": "Quote",
   "@quote": {},
@@ -92,12 +92,12 @@
   "lightLightTint7": "Green",
   "lightLightTint8": "Aqua",
   "lightLightTint9": "Blue",
-  "textColor": "text color",
-  "addYourLink": "add your link",
-  "openLink": "open link",
-  "copyLink": "copy link",
-  "removeLink": "remove link",
-  "highlightColor": "highlight color",
+  "textColor": "Text color",
+  "addYourLink": "Add your link",
+  "openLink": "Open link",
+  "copyLink": "Copy link",
+  "removeLink": "Remove link",
+  "highlightColor": "Highlight color",
   "clearHighlightColor": "clear highlight color",
   "customColor": "custom color",
   "hexValue": "hex value",
diff --git a/lib/src/editor/editor_component/service/keyboard_service_widget.dart b/lib/src/editor/editor_component/service/keyboard_service_widget.dart
index b3b20972c..c84ca0467 100644
--- a/lib/src/editor/editor_component/service/keyboard_service_widget.dart
+++ b/lib/src/editor/editor_component/service/keyboard_service_widget.dart
@@ -227,8 +227,8 @@ class KeyboardServiceWidgetState extends State<KeyboardServiceWidget>
     );
 
     // clear the selection when the focus is lost.
-    if (!focusNode.hasFocus) {
-      editorState.selection = null;
-    }
+    // if (!focusNode.hasFocus) {
+    //   editorState.selection = null;
+    // }
   }
 }
diff --git a/lib/src/extensions/position_extension.dart b/lib/src/extensions/position_extension.dart
index 969a82c62..3b74c75df 100644
--- a/lib/src/extensions/position_extension.dart
+++ b/lib/src/extensions/position_extension.dart
@@ -80,14 +80,14 @@ extension PositionExtension on Position {
       );
       offset = upwards
           ? rect.topRight.translate(0, -rect.height)
-          : rect.bottomRight.translate(0, rect.height);
+          : rect.centerRight.translate(0, rect.height);
     } else {
       final rect = rects.reduce(
         (current, next) => current.top <= next.top ? current : next,
       );
       offset = upwards
           ? rect.topLeft.translate(0, -rect.height)
-          : rect.bottomLeft.translate(0, rect.height);
+          : rect.centerLeft.translate(0, rect.height);
     }
 
     return editorState.service.selectionService.getPositionInOffset(offset);
diff --git a/lib/src/l10n/l10n.dart b/lib/src/l10n/l10n.dart
index fe47ee6d7..1b5bc0880 100644
--- a/lib/src/l10n/l10n.dart
+++ b/lib/src/l10n/l10n.dart
@@ -64,7 +64,7 @@ class AppFlowyEditorLocalizations {
   /// `Bulleted List`
   String get bulletedList {
     return Intl.message(
-      'Bulleted List',
+      'Bulleted list',
       name: 'bulletedList',
       desc: '',
       args: [],
@@ -174,7 +174,7 @@ class AppFlowyEditorLocalizations {
   /// `Numbered List`
   String get numberedList {
     return Intl.message(
-      'Numbered List',
+      'Numbered list',
       name: 'numberedList',
       desc: '',
       args: [],
@@ -604,7 +604,7 @@ class AppFlowyEditorLocalizations {
   /// `text color`
   String get textColor {
     return Intl.message(
-      'text color',
+      'Text color',
       name: 'textColor',
       desc: '',
       args: [],
@@ -614,7 +614,7 @@ class AppFlowyEditorLocalizations {
   /// `add your link`
   String get addYourLink {
     return Intl.message(
-      'add your link',
+      'Add your link',
       name: 'addYourLink',
       desc: '',
       args: [],
@@ -624,7 +624,7 @@ class AppFlowyEditorLocalizations {
   /// `open link`
   String get openLink {
     return Intl.message(
-      'open link',
+      'Open link',
       name: 'openLink',
       desc: '',
       args: [],
@@ -634,7 +634,7 @@ class AppFlowyEditorLocalizations {
   /// `copy link`
   String get copyLink {
     return Intl.message(
-      'copy link',
+      'Copy link',
       name: 'copyLink',
       desc: '',
       args: [],
@@ -644,7 +644,7 @@ class AppFlowyEditorLocalizations {
   /// `remove link`
   String get removeLink {
     return Intl.message(
-      'remove link',
+      'Remove link',
       name: 'removeLink',
       desc: '',
       args: [],
@@ -654,7 +654,7 @@ class AppFlowyEditorLocalizations {
   /// `highlight color`
   String get highlightColor {
     return Intl.message(
-      'highlight color',
+      'Highlight color',
       name: 'highlightColor',
       desc: '',
       args: [],