diff --git a/src/components/appMediaViewer.ts b/src/components/appMediaViewer.ts
index f499bdd9..f98e2fa3 100644
--- a/src/components/appMediaViewer.ts
+++ b/src/components/appMediaViewer.ts
@@ -276,7 +276,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
       cancelEvent(e);
     }
 
-    if(this.setMoverAnimationPromise) return;
+    if(this.setMoverAnimationPromise) return Promise.reject();
 
     appNavigationController.removeByType('media');
 
@@ -302,7 +302,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
 
     promise.finally(() => {
       this.wholeDiv.remove();
-      rootScope.overlayIsActive = false;
+      rootScope.isOverlayActive = false;
       animationIntersector.checkAnimations(false);
     });
 
@@ -983,7 +983,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
       this.pageEl.insertBefore(this.wholeDiv, mainColumns);
       void this.wholeDiv.offsetLeft; // reflow
       this.wholeDiv.classList.add('active');
-      rootScope.overlayIsActive = true;
+      rootScope.isOverlayActive = true;
       animationIntersector.checkAnimations(true);
 
       if(!isMobileSafari) {
@@ -1329,6 +1329,25 @@ export default class AppMediaViewer extends AppMediaViewerBase<'caption', 'delet
     super.setListeners();
     this.buttons.forward.addEventListener('click', this.onForwardClick);
     this.author.container.addEventListener('click', this.onAuthorClick);
+
+    const onCaptionClick = (e: MouseEvent) => {
+      if(e.target instanceof HTMLAnchorElement) { // close viewer if it's t.me/ redirect
+        const onclick = (e.target as HTMLElement).getAttribute('onclick');
+        if(!onclick || onclick.includes('showMaskedAlert')) {
+          return;
+        }
+
+        cancelEvent(e);
+
+        this.close().then(() => {
+          this.content.caption.removeEventListener('click', onCaptionClick, {capture: true});
+          (e.target as HTMLAnchorElement).click();
+        });
+
+        return false;
+      }
+    };
+    this.content.caption.addEventListener('click', onCaptionClick, {capture: true});
   }
 
   /* public close(e?: MouseEvent) {
diff --git a/src/components/chat/selection.ts b/src/components/chat/selection.ts
index a62766b2..b633c2b6 100644
--- a/src/components/chat/selection.ts
+++ b/src/components/chat/selection.ts
@@ -228,7 +228,7 @@ export default class ChatSelection {
   private updateContainer(forceSelection = false) {
     if(!this.selectedMids.size && !forceSelection) return;
     this.selectionCountEl.textContent = '';
-    this.selectionCountEl.append(i18n('Chat.Selection.MessagesCount', [this.selectedMids.size]));
+    this.selectionCountEl.append(i18n('messages', [this.selectedMids.size]));
 
     let cantForward = !this.selectedMids.size, cantDelete = !this.selectedMids.size, cantSend = !this.selectedMids.size;
     for(const mid of this.selectedMids.values()) {
diff --git a/src/components/popups/createPoll.ts b/src/components/popups/createPoll.ts
index a172e8a8..e83f3f96 100644
--- a/src/components/popups/createPoll.ts
+++ b/src/components/popups/createPoll.ts
@@ -12,7 +12,7 @@ import InputField from "../inputField";
 import RadioField from "../radioField";
 import Scrollable from "../scrollable";
 import SendContextMenu from "../chat/sendContextMenu";
-import I18n, { _i18n, i18n } from "../../lib/langPack";
+import I18n, { _i18n } from "../../lib/langPack";
 import findUpTag from "../../helpers/dom/findUpTag";
 import { cancelEvent } from "../../helpers/dom/cancelEvent";
 import getRichValue from "../../helpers/dom/getRichValue";
@@ -38,7 +38,7 @@ export default class PopupCreatePoll extends PopupElement {
   private optionInputFields: InputField[];
 
   constructor(private chat: Chat) {
-    super('popup-create-poll popup-new-media', null, {closable: true, withConfirm: 'NewPoll.Create', body: true});
+    super('popup-create-poll popup-new-media', null, {closable: true, withConfirm: 'Create', body: true});
 
     _i18n(this.title, 'NewPoll');
 
diff --git a/src/components/popups/index.ts b/src/components/popups/index.ts
index 87d72193..26e24e99 100644
--- a/src/components/popups/index.ts
+++ b/src/components/popups/index.ts
@@ -144,7 +144,7 @@ export default class PopupElement {
     document.body.append(this.element);
     void this.element.offsetWidth; // reflow
     this.element.classList.add('active');
-    rootScope.overlayIsActive = true;
+    rootScope.isOverlayActive = true;
     animationIntersector.checkAnimations(true);
   }
 
@@ -158,7 +158,7 @@ export default class PopupElement {
     this.element.classList.remove('active');
 
     if(this.btnClose) this.btnClose.removeEventListener('click', this.hide);
-    rootScope.overlayIsActive = false;
+    rootScope.isOverlayActive = false;
 
     appNavigationController.removeItem(this.navigationItem);
     this.navigationItem = undefined;
diff --git a/src/components/sidebarLeft/tabs/editProfile.ts b/src/components/sidebarLeft/tabs/editProfile.ts
index 870aca44..29f283f7 100644
--- a/src/components/sidebarLeft/tabs/editProfile.ts
+++ b/src/components/sidebarLeft/tabs/editProfile.ts
@@ -99,7 +99,7 @@ export default class AppEditProfileTab extends SliderSuperTab {
 
       const caption = document.createElement('div');
       caption.classList.add('caption');
-      caption.append(i18n('EditProfile.Username.Help'));
+      caption.append(i18n('UsernameSettings.ChangeDescription'));
       caption.append(document.createElement('br'), document.createElement('br'));
 
       const profileUrlContainer = this.profileUrlContainer = document.createElement('div');
diff --git a/src/index.ts b/src/index.ts
index cb183242..cdaad2b8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -65,7 +65,7 @@ console.timeEnd('get storage1'); */
     let lastVH: number;
     const setVH = () => {
       // @ts-ignore
-      const vh = (setViewportVH && !rootScope.default.overlayIsActive ? w.height || w.innerHeight : window.innerHeight) * 0.01;
+      const vh = (setViewportVH && !rootScope.default.isOverlayActive ? w.height || w.innerHeight : window.innerHeight) * 0.01;
       if(lastVH === vh) {
         return;
       } else if(lastVH < vh) {
@@ -116,7 +116,7 @@ console.timeEnd('get storage1'); */
     //console.log(new Uint8Array([255, 200, 145]).hex);
 
     const toggleResizeMode = () => {
-      setViewportVH = tabId === 1 && userAgent.isSafari && touchSupport.isTouchSupported && !rootScope.default.overlayIsActive;
+      setViewportVH = tabId === 1 && userAgent.isSafari && touchSupport.isTouchSupported && !rootScope.default.isOverlayActive;
       setVH();
 
       if(w !== window) {
diff --git a/src/lang.ts b/src/lang.ts
index 2041c1ed..9d112ba9 100644
--- a/src/lang.ts
+++ b/src/lang.ts
@@ -23,7 +23,6 @@ const lang = {
   "EditProfile.Username.Available": "Username is available",
   "EditProfile.Username.Taken": "Username is already taken",
   "EditProfile.Username.Invalid": "Username is invalid",
-  "EditProfile.Username.Help": "You can choose a username on Telegram. If you do, people will be able to find you by this username and contact you without needing your phone number.\n\nYou can use a–z, 0–9 and underscores. Minimum length is 5 characters.",
   "ExceptionModal.Search.Placeholder": "Add exception...",
   "Chat.Menu.SelectMessages": "Select Messages",
   "Chat.Menu.ClearSelection": "Clear Selection",
@@ -32,10 +31,6 @@ const lang = {
   "Chat.Input.Attach.PhotoOrVideo": "Photo or Video",
   "Chat.Input.Attach.Document": "Document",
   "Chat.Subscribe": "SUBSCRIBE",
-  "Chat.Selection.MessagesCount": {
-    "one_value": "%d Message",
-    "other_value": "%d Messages"
-  },
   "Chat.Selection.LimitToast": "Max selection count reached.",
   "Chat.Search.MessagesFound": {
     "one_value": "%d message found",
@@ -79,7 +74,6 @@ const lang = {
   "Notifications.MessagePreview": "Message preview",
   "NewPrivateChat": "New Private Chat",
   "NewPoll.OptionLabel": "Option %d",
-  "NewPoll.Create": "CREATE",
   "Message.Context.Selection.Copy": "Copy selected",
   "Message.Context.Selection.Clear": "Clear selection",
   "Message.Context.Selection.Delete": "Delete selected",
@@ -552,6 +546,7 @@ const lang = {
   "LeaveAComment": "Leave a comment",
   "ViewInChat": "View in chat",
   "LinkNotFound": "Unfortunately, you can\'t access this message. You are not a member of the chat where it was posted.",
+  "Create": "Create",
 
   // * macos
   "AccountSettings.Filters": "Chat Folders",
@@ -811,7 +806,8 @@ const lang = {
   "TwoStepAuth.RecoveryCodeInvalid": "Invalid code. Please try again.",
   "TwoStepAuth.RecoveryCodeExpired": "Code Expired",
   "TwoStepAuth.SetupHintTitle": "Password Hint",
-  "TwoStepAuth.SetupHintPlaceholder": "Hint"
+  "TwoStepAuth.SetupHintPlaceholder": "Hint",
+  "UsernameSettings.ChangeDescription": "You can choose a username on Telegram. If you do, people will be able to find you by this username and contact you without needing your phone number.\n\n\nYou can use a-z, 0-9 and underscores. Minimum length is 5 characters."
 };
 
 export default lang;
diff --git a/src/lib/appManagers/appImManager.ts b/src/lib/appManagers/appImManager.ts
index 992a5898..85dff69d 100644
--- a/src/lib/appManagers/appImManager.ts
+++ b/src/lib/appManagers/appImManager.ts
@@ -645,7 +645,7 @@ export class AppImManager {
     
     const IGNORE_KEYS = new Set(['PageUp', 'PageDown', 'Meta', 'Control']);
     const onKeyDown = (e: KeyboardEvent) => {
-      if(rootScope.overlayIsActive || IGNORE_KEYS.has(e.key)) return;
+      if(rootScope.isOverlayActive || IGNORE_KEYS.has(e.key)) return;
       
       const target = e.target as HTMLElement;
       
@@ -845,7 +845,7 @@ export class AppImManager {
 
   private canDrag() {
     const peerId = this.chat?.peerId;
-    return !(!peerId || rootScope.overlayIsActive || (peerId < 0 && !appChatsManager.hasRights(peerId, 'send_media')));
+    return !(!peerId || rootScope.isOverlayActive || (peerId < 0 && !appChatsManager.hasRights(peerId, 'send_media')));
   }
 
   private onDocumentPaste = (e: ClipboardEvent | DragEvent, attachType?: 'media' | 'document') => {
diff --git a/src/lib/mediaPlayer.ts b/src/lib/mediaPlayer.ts
index 601c57a4..97799279 100644
--- a/src/lib/mediaPlayer.ts
+++ b/src/lib/mediaPlayer.ts
@@ -14,6 +14,7 @@ import ListenerSetter from "../helpers/listenerSetter";
 import ButtonMenu from "../components/buttonMenu";
 import { ButtonMenuToggleHandler } from "../components/buttonMenuToggle";
 import EventListenerBase from "../helpers/eventListenerBase";
+import rootScope from "./rootScope";
 
 export class MediaProgressLine extends RangeSelector {
   private filledLoad: HTMLDivElement;
@@ -370,10 +371,11 @@ export default class VideoPlayer extends EventListenerBase<{
         });
 
         this.listenerSetter.add(document)('keydown', (e: KeyboardEvent) => {
-          if((e.target as HTMLElement) === document.activeElement) {
+          if(rootScope.overlaysActive > 1) { // forward popup is active, etc
             return;
           }
 
+          let good = true;
           if(e.code === 'KeyF') {
             this.toggleFullScreen(fullScreenButton);
           } else if(e.code === 'KeyM') {
@@ -384,6 +386,13 @@ export default class VideoPlayer extends EventListenerBase<{
             this.video.playbackRate += 0.25;
           } else if(e.altKey && e.code === 'Minus') {
             this.video.playbackRate -= 0.25;
+          } else {
+            good = false;
+          }
+
+          if(good) {
+            cancelEvent(e);
+            return false;
           }
         });
       }
diff --git a/src/lib/rootScope.ts b/src/lib/rootScope.ts
index e9f66c48..4fd115b2 100644
--- a/src/lib/rootScope.ts
+++ b/src/lib/rootScope.ts
@@ -132,7 +132,7 @@ export class RootScope extends EventListenerBase<{
 } & {
   [name in keyof BroadcastEvents]: (e: BroadcastEvents[name]) => void
 }> {
-  private _overlayIsActive: boolean = false;
+  public overlaysActive = 0;
   public myId = 0;
   public idle = {
     isIDLE: true,
@@ -217,13 +217,13 @@ export class RootScope extends EventListenerBase<{
     document.documentElement.classList.toggle('night', isNight);
   }
 
-  get overlayIsActive() {
-    return this._overlayIsActive;
+  get isOverlayActive() {
+    return this.overlaysActive > 0;
   }
 
-  set overlayIsActive(value: boolean) {
-    this._overlayIsActive = value;
-    this.dispatchEvent('overlay_toggle', value);
+  set isOverlayActive(value: boolean) {
+    this.overlaysActive += value ? 1 : -1;
+    this.dispatchEvent('overlay_toggle', this.isOverlayActive);
   }
 
   public getTheme(name: Theme['name'] = this.settings.theme === 'system' ? this.systemTheme : this.settings.theme) {
diff --git a/src/scss/partials/_chat.scss b/src/scss/partials/_chat.scss
index c3fe3085..d5dcfda2 100644
--- a/src/scss/partials/_chat.scss
+++ b/src/scss/partials/_chat.scss
@@ -701,6 +701,7 @@ $chat-helper-size: 36px;
 			flex-grow: 1;
 			white-space: nowrap;
 			//padding-left: .5rem;
+			text-transform: capitalize;
 		}
 
 		.btn-icon {