diff --git a/frontend/app/components/Session/Player/ClickMapRenderer/Renderer.tsx b/frontend/app/components/Session/Player/ClickMapRenderer/Renderer.tsx
index 8ec99101b..a365dc163 100644
--- a/frontend/app/components/Session/Player/ClickMapRenderer/Renderer.tsx
+++ b/frontend/app/components/Session/Player/ClickMapRenderer/Renderer.tsx
@@ -31,7 +31,7 @@ function Player() {
     >
       <div className={cn("relative flex-1", 'overflow-visible')}>
         <Overlay isClickmap />
-        <div className={cn(stl.screenWrapper, '!overflow-y-scroll')} style={{ height: wrapperHeight, maxHeight: 900 }} ref={screenWrapper} />
+        <div className={cn(stl.screenWrapper, '!overflow-y-scroll')} style={{ height: wrapperHeight, maxHeight: 800 }} ref={screenWrapper} />
       </div>
     </div>
   );
diff --git a/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx b/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx
index cac7e87ec..e07ffd70e 100644
--- a/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx
+++ b/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx
@@ -55,7 +55,6 @@ function Player(props: IProps) {
     bottomBlock,
     activeTab,
     fullView,
-    isClickmap,
   } = props;
   const playerContext = React.useContext(PlayerContext);
   const isReady = playerContext.store.get().ready
@@ -88,9 +87,9 @@ function Player(props: IProps) {
       data-bottom-block={bottomBlockIsActive}
     >
       {fullscreen && <EscapeButton onClose={fullscreenOff} />}
-      <div className={cn("relative flex-1", isClickmap ? 'overflow-visible' : 'overflow-hidden')}>
-        <Overlay nextId={nextId} isClickmap={isClickmap} />
-        <div className={cn(stl.screenWrapper, isClickmap && '!overflow-y-scroll')} ref={screenWrapper} />
+      <div className={cn("relative flex-1",'overflow-hidden')}>
+        <Overlay nextId={nextId} />
+        <div className={cn(stl.screenWrapper)} ref={screenWrapper} />
       </div>
       {!fullscreen && !!bottomBlock && (
         <div style={{ maxWidth, width: '100%' }}>
@@ -106,7 +105,7 @@ function Player(props: IProps) {
           {bottomBlock === INSPECTOR && <Inspector />}
         </div>
       )}
-      {!fullView && !isClickmap ? (
+      {!fullView ? (
         <Controls
           speedDown={playerContext.player.speedDown}
           speedUp={playerContext.player.speedUp}
diff --git a/frontend/app/components/Session/WebPlayer.tsx b/frontend/app/components/Session/WebPlayer.tsx
index 6c34fdec7..a7865621f 100644
--- a/frontend/app/components/Session/WebPlayer.tsx
+++ b/frontend/app/components/Session/WebPlayer.tsx
@@ -72,6 +72,7 @@ function WebPlayer(props: any) {
       WebPlayerInst.jump(parseInt(jumpToTime));
     }
     if (freeze) {
+      console.log(freeze)
       WebPlayerInst.freeze()
     }
 
@@ -82,17 +83,6 @@ function WebPlayer(props: any) {
 
   React.useEffect(() => {
     contextValue.player && contextValue.player.play()
-    if (isClickmap && isPlayerReady && insights.size > 0) {
-      setTimeout(() => {
-        contextValue.player.jump(jumpTimestamp)
-        contextValue.player.pause()
-        contextValue.player.scaleFullPage()
-        setTimeout(() => { contextValue.player.showClickmap(insights) }, 250)
-      }, 1500)
-    }
-    return () => {
-      isPlayerReady && contextValue.player.showClickmap(null)
-    }
   }, [insights, isPlayerReady, jumpTimestamp])
 
   // LAYOUT (TODO: local layout state - useContext or something..)
diff --git a/frontend/app/components/Session_/Player/Controls/Controls.tsx b/frontend/app/components/Session_/Player/Controls/Controls.tsx
index 98061c537..221cc064a 100644
--- a/frontend/app/components/Session_/Player/Controls/Controls.tsx
+++ b/frontend/app/components/Session_/Player/Controls/Controls.tsx
@@ -138,14 +138,6 @@ function Controls(props: any) {
     player.jumpInterval(-SKIP_INTERVALS[skipInterval]);
   };
 
-  const renderPlayBtn = () => {
-    const state = completed ? PlayingState.Completed : playing ? PlayingState.Playing : PlayingState.Paused
-
-    return (
-      <PlayButton state={state} togglePlay={player.togglePlay} iconSize={36} />
-    );
-  };
-
   const toggleBottomTools = (blockName: number) => {
     if (blockName === INSPECTOR) {
       // player.toggleInspectorMode(false);
@@ -156,6 +148,8 @@ function Controls(props: any) {
     }
   };
 
+  const state = completed ? PlayingState.Completed : playing ? PlayingState.Playing : PlayingState.Paused
+
   return (
     <div className={styles.controls}>
       <Timeline />
@@ -170,7 +164,7 @@ function Controls(props: any) {
               forthTenSeconds={forthTenSeconds}
               toggleSpeed={() => player.toggleSpeed()}
               toggleSkip={() => player.toggleSkip()}
-              playButton={renderPlayBtn()}
+              playButton={<PlayButton state={state} togglePlay={player.togglePlay} iconSize={36} />}
               skipIntervals={SKIP_INTERVALS}
               setSkipInterval={changeSkipInterval}
               currentInterval={skipInterval}