diff --git a/frontend/src/components/NewModalSubscripton.js b/frontend/src/components/NewModalSubscripton.js
index 6d613e14..9fb40a2b 100644
--- a/frontend/src/components/NewModalSubscripton.js
+++ b/frontend/src/components/NewModalSubscripton.js
@@ -21,11 +21,18 @@ import { useForm } from "react-hook-form";
 import { GithubPicker } from "react-color";
 import { BiRefresh } from "react-icons/bi";
 import { makeColor } from "../core/utils/makeColor";
-const NewSubscription = ({ isFreeOption, onClose }) => {
+const NewSubscription = ({
+  isFreeOption,
+  onClose,
+  initialAddress,
+  initialType,
+}) => {
   const [color, setColor] = useState(makeColor());
   const { typesCache, createSubscription } = useSubscriptions();
   const { handleSubmit, errors, register } = useForm({});
-  const [radioState, setRadioState] = useState("ethereum_blockchain");
+  const [radioState, setRadioState] = useState(
+    initialType ?? "ethereum_blockchain"
+  );
   let { getRootProps, getRadioProps } = useRadioGroup({
     name: "type",
     defaultValue: radioState,
@@ -78,6 +85,8 @@ const NewSubscription = ({ isFreeOption, onClose }) => {
             autoComplete="off"
             my={2}
             placeholder="Enter address"
+            defaultValue={initialAddress ?? undefined}
+            isReadOnly={!!initialAddress}
             name="address"
             ref={register({ required: "address is required!" })}
           ></Input>
@@ -98,6 +107,7 @@ const NewSubscription = ({ isFreeOption, onClose }) => {
                 const radio = getRadioProps({
                   value: type.id,
                   isDisabled:
+                    (initialAddress && initialType) ||
                     !type.active ||
                     (isFreeOption && type.id !== "ethereum_blockchain"),
                 });
diff --git a/frontend/src/components/NewSubscription.js b/frontend/src/components/NewSubscription.js
index 8acd08b2..230ea755 100644
--- a/frontend/src/components/NewSubscription.js
+++ b/frontend/src/components/NewSubscription.js
@@ -21,12 +21,20 @@ import { CirclePicker } from "react-color";
 import { BiRefresh } from "react-icons/bi";
 import { makeColor } from "../core/utils/makeColor";
 import { useForm } from "react-hook-form";
-const _NewSubscription = ({ isFreeOption, onClose, setIsLoading }) => {
+const _NewSubscription = ({
+  isFreeOption,
+  onClose,
+  setIsLoading,
+  initialAddress,
+  initialType,
+}) => {
   const [color, setColor] = useState(makeColor());
   const { handleSubmit, errors, register } = useForm({});
   const { typesCache, createSubscription } = useSubscriptions();
   // const { handleSubmit, errors, register } = useForm({});
-  const [radioState, setRadioState] = useState("ethereum_blockchain");
+  const [radioState, setRadioState] = useState(
+    initialType ?? "ethereum_blockchain"
+  );
   let { getRootProps, getRadioProps } = useRadioGroup({
     name: "type",
     defaultValue: radioState,
@@ -52,7 +60,7 @@ const _NewSubscription = ({ isFreeOption, onClose, setIsLoading }) => {
       createSubscription.mutate({
         ...props,
         color: color,
-        type: isFreeOption ? 0 : radioState,
+        type: isFreeOption ? "ethereum_blockchain" : radioState,
       });
     },
     [createSubscription, isFreeOption, color, radioState]
@@ -107,6 +115,7 @@ const _NewSubscription = ({ isFreeOption, onClose, setIsLoading }) => {
               const radio = getRadioProps({
                 value: type.id,
                 isDisabled:
+                  (initialAddress && initialType) ||
                   !type.active ||
                   (isFreeOption && type.id !== "ethereum_blockchain"),
               });
diff --git a/frontend/src/components/StreamEntry.js b/frontend/src/components/StreamEntry.js
index 4e8e7194..8f399b21 100644
--- a/frontend/src/components/StreamEntry.js
+++ b/frontend/src/components/StreamEntry.js
@@ -67,6 +67,9 @@ const StreamEntry_ = ({ entry, showOnboardingTooltips, className }) => {
             maxW="150px"
           >
             <IconButton
+              isDisabled={
+                entry.event_type === "ethereum_whalewatch" ? true : false
+              }
               m={0}
               onClick={() => ui.setCurrentTransaction(entry)}
               h="full"
diff --git a/frontend/src/components/stream-cards/EthereumWhalewatch.js b/frontend/src/components/stream-cards/EthereumWhalewatch.js
index 11fccb4f..c412a8d0 100644
--- a/frontend/src/components/stream-cards/EthereumWhalewatch.js
+++ b/frontend/src/components/stream-cards/EthereumWhalewatch.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import {
   Text,
   Stack,
@@ -6,22 +6,31 @@ import {
   useClipboard,
   Heading,
   Image,
-  useMediaQuery,
   Spacer,
   Spinner,
   chakra,
+  SimpleGrid,
+  Box,
+  Modal,
+  ModalContent,
+  ModalOverlay,
+  IconButton,
+  useDisclosure,
 } from "@chakra-ui/react";
-import UIContext from "../../core/providers/UIProvider/context";
 import { useToast } from "../../core/hooks";
 import { useSubscriptions } from "../../core/hooks";
+import moment from "moment";
+import { AiOutlineMonitor } from "react-icons/ai";
+import NewSubscription from "../NewModalSubscripton";
 
 const EthereumWhalewatchCard_ = ({
   entry,
   showOnboardingTooltips,
   className,
 }) => {
+  const [newSubscriptionWhaleType, setNewSubscriptionWhaleType] = useState();
+  const { isOpen, onOpen, onClose } = useDisclosure();
   const { subscriptionsCache, subscriptionTypeIcons } = useSubscriptions();
-  const ui = useContext(UIContext);
   const [copyString, setCopyString] = useState(false);
   const [icon, setIcon] = useState(null);
   const { onCopy, hasCopied } = useClipboard(copyString, 1);
@@ -41,8 +50,6 @@ const EthereumWhalewatchCard_ = ({
       setIcon(subscriptionTypeIcons.ethereum_whalewatch);
     }
   }, [subscriptionTypeIcons, setIcon]);
-
-  const [showFullView] = useMediaQuery(["(min-width: 420px)"]);
   if (subscriptionsCache.isLoading) return <Spinner />;
 
   const whales = {
@@ -64,14 +71,35 @@ const EthereumWhalewatchCard_ = ({
   });
 
   const rowLabels = {
-    transactionsOut: "Number of transactions sent",
-    transactionsIn: "Number of transactions received",
+    transactionsOut: "transactions sent",
+    transactionsIn: "transactions received",
     valueOut: "WEI sent",
     valueIn: "WEI received",
   };
 
+  const subscribeClicked = (whaleType) => {
+    setNewSubscriptionWhaleType(whaleType);
+    onOpen();
+  };
   return (
     <Stack className={className}>
+      <Modal
+        isOpen={isOpen}
+        onClose={onClose}
+        size="2xl"
+        scrollBehavior="outside"
+      >
+        <ModalOverlay />
+
+        <ModalContent>
+          <NewSubscription
+            isFreeOption={false}
+            onClose={onClose}
+            initialAddress={whales[newSubscriptionWhaleType]?.address}
+            initialType="ethereum_blockchain"
+          />
+        </ModalContent>
+      </Modal>
       <Tooltip
         hasArrow
         isOpen={showOnboardingTooltips}
@@ -91,90 +119,129 @@ const EthereumWhalewatchCard_ = ({
           bgColor="gray.300"
         >
           {icon ? <Image boxSize="16px" src={icon} /> : ""}
-          <Heading px={1} size="xs">
+          <Heading px={1} size="xs" isTruncated>
             Ethereum whale watch
           </Heading>
           <Spacer />
           <Text isTruncated pr={12}>
-            {`${entry.event_data.date_range.start_time} to ${entry.event_data.date_range.end_time}`}
+            {`${moment(entry.event_data.date_range.start_time).format(
+              "ll [from] LT"
+            )} to ${moment(entry.event_data.date_range.end_time).format(
+              moment(entry.event_data.date_range.start_time).format("l") ===
+                moment(entry.event_data.date_range.end_time).format("l")
+                ? "LT"
+                : "lll"
+            )}`}
           </Text>
         </Stack>
       </Tooltip>
-      {Object.keys(whales).map((whaleType) => {
-        return (
-          <Stack
-            className={whaleType}
-            direction={showFullView ? "row" : "column"}
-            w="100%"
-            h={showFullView ? "1.6rem" : "3.2rem"}
-            minH="1.6rem"
-            spacing={0}
-            alignItems="center"
-            key={`${whaleType}-${entry.event_data.date_range.start_time}-${entry.event_data.date_range.end_time}`}
-          >
-            <Stack
-              overflow="hidden"
-              textOverflow="ellipsis"
-              whiteSpace="nowrap"
-              direction="row"
-              fontSize="sm"
-              fontWeight="600"
-              w={showFullView ? "calc(30%)" : "calc(100%)"}
-              h="100%"
-              borderColor="gray.1200"
-              borderRightWidth={showFullView ? "1px" : "0px"}
-              placeContent="center"
-              spacing={0}
-            >
-              <Tooltip
-                hasArrow
-                isOpen={showOnboardingTooltips && !ui.isMobileView}
-                label={`This row represents the following statistic: ${rowLabels[whaleType]}`}
-                aria-label={`This row represents the following statistic: ${rowLabels[whaleType]}`}
-                variant="onboarding"
-                placement={ui.isMobileView ? "bottom" : "left"}
-                maxW="150px"
-              >
+      <SimpleGrid columns={9} w="100%" minWidth="min-content">
+        <Text
+          gridColumn="1 / 3"
+          h="100%"
+          w="100%"
+          fontSize="sm"
+          py="2px"
+          px={2}
+          fontWeight="600"
+          // w={showFullView ? null : "120px"}
+          justifyContent="flex-start"
+        >
+          Whale
+        </Text>
+        <Text
+          gridColumn="3 / 8"
+          h="100%"
+          w="100%"
+          fontSize="sm"
+          py="2px"
+          px={2}
+          fontWeight="600"
+          // w={showFullView ? null : "120px"}
+          justifyContent="flex-start"
+        >
+          Address
+        </Text>
+        <Text
+          gridColumn="8 / 10"
+          h="100%"
+          w="100%"
+          fontSize="sm"
+          py="2px"
+          px={2}
+          fontWeight="600"
+          // w={showFullView ? null : "120px"}
+          justifyContent="flex-start"
+        >
+          Value
+        </Text>
+        {Object.keys(whales).map((whaleType) => {
+          return (
+            <>
+              <Box gridColumn="1 / 3">
                 <Text
                   h="100%"
+                  w="100%"
                   fontSize="sm"
                   py="2px"
                   px={2}
-                  w={showFullView ? null : "120px"}
+                  justifyContent="flex-start"
+                  isTruncated
                 >
                   {rowLabels[whaleType]}
                 </Text>
-              </Tooltip>
-            </Stack>
-            <Stack
-              overflow="hidden"
-              textOverflow="ellipsis"
-              whiteSpace="nowrap"
-              direction="row"
-              fontSize="sm"
-              fontWeight="600"
-              minw="min-content"
-              w={showFullView ? "calc(70%)" : "calc(100%)"}
-              h="100%"
-              spacing={0}
-              textAlign="left"
-            >
-              <Text
+              </Box>
+              <Stack
+                gridColumn="3 / 8"
                 mx={0}
                 py="2px"
                 fontSize="sm"
                 bgColor={whales[whaleType].color}
+                h="100%"
+                direction="row"
+              >
+                <Box
+                  onClick={() => setCopyString(whales[whaleType].address)}
+                  isTruncated
+                >
+                  {whales[whaleType].label}
+                </Box>
+                <Spacer />
+                {whales[whaleType].label === whales[whaleType].address && (
+                  <Tooltip
+                    label="subscribe to this address"
+                    variant="onboarding"
+                  >
+                    <Box boxSize="min-content">
+                      <IconButton
+                        onClick={() => subscribeClicked(whaleType)}
+                        colorScheme="secondary"
+                        variant="outline"
+                        m={0}
+                        boxSize="24px"
+                        icon={<AiOutlineMonitor />}
+                      />
+                    </Box>
+                  </Tooltip>
+                )}
+              </Stack>
+              <Box
+                gridColumn="8 / 10"
+                mx={0}
+                py="2px"
+                fontSize="sm"
                 isTruncated
                 w="calc(100%)"
                 h="100%"
-                onClick={() => setCopyString(whales[whaleType].address)}
+                textAlign="left"
+                pl={2}
               >
-                {whales[whaleType].label} -- {whales[whaleType].statistic}
-              </Text>
-            </Stack>
-          </Stack>
-        );
-      })}
+                {whales[whaleType].statistic}
+              </Box>
+            </>
+          );
+        })}
+      </SimpleGrid>
     </Stack>
   );
 };