diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index 8dc87c90d..738a5e3d9 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -390,14 +390,14 @@ def search2_series(data: schemas.SessionsSearchPayloadSchema, project_id: int, d
 
 def __is_valid_event(is_any: bool, event: schemas._SessionSearchEventSchema):
     return not (not is_any and len(event.value) == 0 and event.type not in [schemas.EventType.request_details,
-                                                                            schemas.EventType.graphql_details] \
+                                                                            schemas.EventType.graphql] \
                 or event.type in [schemas.PerformanceEventType.location_dom_complete,
                                   schemas.PerformanceEventType.location_largest_contentful_paint_time,
                                   schemas.PerformanceEventType.location_ttfb,
                                   schemas.PerformanceEventType.location_avg_cpu_load,
                                   schemas.PerformanceEventType.location_avg_memory_usage
                                   ] and (event.source is None or len(event.source) == 0) \
-                or event.type in [schemas.EventType.request_details, schemas.EventType.graphql_details] and (
+                or event.type in [schemas.EventType.request_details, schemas.EventType.graphql] and (
                         event.filters is None or len(event.filters) == 0))
 
 
@@ -698,12 +698,12 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
                     event_where.append(
                         _multiple_conditions(f"main.{events.event_type.REQUEST.column} {op} %({e_k})s", event.value,
                                              value_key=e_k))
-            elif event_type == events.event_type.GRAPHQL.ui_type:
-                event_from = event_from % f"{events.event_type.GRAPHQL.table} AS main "
-                if not is_any:
-                    event_where.append(
-                        _multiple_conditions(f"main.{events.event_type.GRAPHQL.column} {op} %({e_k})s", event.value,
-                                             value_key=e_k))
+            # elif event_type == events.event_type.GRAPHQL.ui_type:
+            #     event_from = event_from % f"{events.event_type.GRAPHQL.table} AS main "
+            #     if not is_any:
+            #         event_where.append(
+            #             _multiple_conditions(f"main.{events.event_type.GRAPHQL.column} {op} %({e_k})s", event.value,
+            #                                  value_key=e_k))
             elif event_type == events.event_type.STATEACTION.ui_type:
                 event_from = event_from % f"{events.event_type.STATEACTION.table} AS main "
                 if not is_any:
@@ -891,7 +891,7 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
                         print(f"undefined FETCH filter: {f.type}")
                 if not apply:
                     continue
-            elif event_type == schemas.EventType.graphql_details:
+            elif event_type == schemas.EventType.graphql:
                 event_from = event_from % f"{events.event_type.GRAPHQL.table} AS main "
                 for j, f in enumerate(event.filters):
                     is_any = _isAny_opreator(f.operator)
diff --git a/api/schemas.py b/api/schemas.py
index bacceea78..f0f20e657 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -389,7 +389,6 @@ class EventType(str, Enum):
     request = "REQUEST"
     request_details = "FETCH"
     graphql = "GRAPHQL"
-    graphql_details = "GRAPHQL_DETAILS"
     state_action = "STATEACTION"
     error = "ERROR"
     click_ios = "CLICK_IOS"
@@ -568,9 +567,9 @@ class _SessionSearchEventRaw(__MixedSearchFilter):
         elif values.get("type") == EventType.request_details:
             assert isinstance(values.get("filters"), List) and len(values.get("filters", [])) > 0, \
                 f"filters should be defined for {EventType.request_details.value}"
-        elif values.get("type") == EventType.graphql_details:
+        elif values.get("type") == EventType.graphql:
             assert isinstance(values.get("filters"), List) and len(values.get("filters", [])) > 0, \
-                f"filters should be defined for {EventType.graphql_details.value}"
+                f"filters should be defined for {EventType.graphql.value}"
 
         return values
 
diff --git a/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx b/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
index 078122bb2..7371056fd 100644
--- a/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
+++ b/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
@@ -1,29 +1,28 @@
 import React from 'react';
-import { Popup, IconButton } from 'UI';
+import { Popup, Button, IconButton } from 'UI';
 import { useStore } from 'App/mstore';
 import { useObserver } from 'mobx-react-lite';
 
 const PERMISSION_WARNING = 'You don’t have the permissions to perform this action.';
 const LIMIT_WARNING = 'You have reached site limit.';
 
-function AddProjectButton({ isAdmin = false, onClick }: any ) {
+function AddProjectButton({ isAdmin = false, onClick }: any) {
     const { userStore } = useStore();
     const limtis = useObserver(() => userStore.limits);
     const canAddProject = useObserver(() => isAdmin && (limtis.projects === -1 || limtis.projects > 0));
     return (
-        <Popup
-            content={ `${ !isAdmin ? PERMISSION_WARNING : (!canAddProject ? LIMIT_WARNING : 'Add a Project') }` }
-        >
-            <IconButton
+        <Popup content={`${!isAdmin ? PERMISSION_WARNING : !canAddProject ? LIMIT_WARNING : 'Add a Project'}`}>
+            <Button rounded={true} variant="outline" icon="plus" onClick={onClick} disabled={!canAddProject || !isAdmin}></Button>
+            {/* <IconButton
                 id="add-button"
                 disabled={ !canAddProject || !isAdmin }
                 circle
                 icon="plus"
                 outline
                 onClick={ onClick }
-            />
+            /> */}
         </Popup>
     );
 }
 
-export default AddProjectButton;
\ No newline at end of file
+export default AddProjectButton;
diff --git a/frontend/app/components/Client/Sites/NewSiteForm.js b/frontend/app/components/Client/Sites/NewSiteForm.js
index 57713d981..c6633b73b 100644
--- a/frontend/app/components/Client/Sites/NewSiteForm.js
+++ b/frontend/app/components/Client/Sites/NewSiteForm.js
@@ -12,7 +12,7 @@ import { confirm } from 'UI';
 	site: state.getIn([ 'site', 'instance' ]),
 	sites: state.getIn([ 'site', 'list' ]),
 	siteList: state.getIn([ 'site', 'list' ]),
-	loading: state.getIn([ 'site', 'save', 'loading' ]),
+	loading: state.getIn([ 'site', 'save', 'loading' ]) || state.getIn([ 'site', 'remove', 'loading' ]),
 }), {
 	save,
 	remove,
@@ -103,9 +103,11 @@ export default class NewSiteForm extends React.PureComponent {
 						>
 							{site.exists() ? 'Update' : 'Add'}
 						</Button>
-						<Button variant="text" type="button" plain onClick={() => this.remove(site)}>
-							<Icon name="trash" size="16" />
-						</Button>
+						{site.exists() && (
+							<Button variant="text" type="button" onClick={() => this.remove(site)}>
+								<Icon name="trash" size="16" />
+							</Button>
+						)}
 					</div>
 					{ this.state.existsError &&
 						<div className={ styles.errorMessage }>
diff --git a/frontend/app/components/ui/Button/Button.tsx b/frontend/app/components/ui/Button/Button.tsx
index 075d95b33..bc71be3a0 100644
--- a/frontend/app/components/ui/Button/Button.tsx
+++ b/frontend/app/components/ui/Button/Button.tsx
@@ -10,6 +10,7 @@ interface Props {
     type?: 'button' | 'submit' | 'reset';
     loading?: boolean;
     icon?: string;
+    rounded?: boolean;
     [x: string]: any;
 }
 export default (props: Props) => {
@@ -22,10 +23,12 @@ export default (props: Props) => {
         disabled = false,
         children,
         loading = false,
+        rounded = false,
         ...rest
     } = props;
 
-    const classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
+    let classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
+
     if (variant === 'default') {
         classes.push('bg-white hover:bg-gray-lightest border border-gray-light');
     }
@@ -62,6 +65,10 @@ export default (props: Props) => {
         iconColor = 'red';
     }
 
+    if (rounded) {
+        classes = classes.map((c) => c.replace('rounded', 'rounded-full h-10 w-10 justify-center'));
+    }
+
     return (
         <button {...rest} type={type} className={cn(classes, className)}>
             {icon && <Icon className={cn({ 'mr-2': children })} name={icon} color={iconColor} size="16" />}
diff --git a/frontend/app/components/ui/CircularLoader/CircularLoader.js b/frontend/app/components/ui/CircularLoader/CircularLoader.js
index 74fa004f4..4c9fb69f5 100644
--- a/frontend/app/components/ui/CircularLoader/CircularLoader.js
+++ b/frontend/app/components/ui/CircularLoader/CircularLoader.js
@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 
 export default ({ children = null, loading = true, size = 'tiny', ...props }) => (!loading ? children :
-  <svg role="status" class={cn("mr-2 color-gray-light animate-spin fill-teal", { 'w-6 h-6 ' : size === "tiny", 'w-8 h-8' : size === 'large'  })} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg role="status" className={cn("mr-2 color-gray-light animate-spin fill-teal", { 'w-6 h-6 ' : size === "tiny", 'w-8 h-8' : size === 'large'  })} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
     <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
   </svg>
diff --git a/frontend/app/components/ui/ItemMenu/ItemMenu.js b/frontend/app/components/ui/ItemMenu/ItemMenu.js
index 18dc414d4..442bcac50 100644
--- a/frontend/app/components/ui/ItemMenu/ItemMenu.js
+++ b/frontend/app/components/ui/ItemMenu/ItemMenu.js
@@ -1,90 +1,81 @@
 import React from 'react';
-import { Icon, Popup } from 'UI';
+import { Icon } from 'UI';
 import styles from './itemMenu.module.css';
 import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv';
 import cn from 'classnames';
 
 export default class ItemMenu extends React.PureComponent {
-  state = {
-    displayed: false,
-  };
+    state = {
+        displayed: false,
+    };
 
-  handleEsc = (e) => e.key === 'Escape' && this.closeMenu()
+    handleEsc = (e) => e.key === 'Escape' && this.closeMenu();
 
-  componentDidMount() {
-    document.addEventListener("keydown", this.handleEsc, false);
-  }
-  componentWillUnmount() {
-    document.removeEventListener("keydown", this.handleEsc, false);
-  }
+    componentDidMount() {
+        document.addEventListener('keydown', this.handleEsc, false);
+    }
+    componentWillUnmount() {
+        document.removeEventListener('keydown', this.handleEsc, false);
+    }
 
-  onClick = callback => (e) => {
-    e.stopPropagation();
-    callback(e);
-  }
+    onClick = (callback) => (e) => {
+        e.stopPropagation();
+        callback(e);
+    };
 
-  toggleMenu = (e) => {
-    this.setState({ displayed: !this.state.displayed });
-  }
+    toggleMenu = (e) => {
+        this.setState({ displayed: !this.state.displayed });
+    };
 
-  closeMenu = () => this.setState({ displayed: false })
+    closeMenu = () => this.setState({ displayed: false });
 
-  render() {
-    const { items, label = "", bold } = this.props;
-    const { displayed } = this.state;
-    const parentStyles = label ? 'rounded px-2 py-2 hover:bg-gray-light' : '';
+    render() {
+        const { items, label = '', bold } = this.props;
+        const { displayed } = this.state;
+        const parentStyles = label ? 'rounded px-2 py-2 hover:bg-gray-light' : '';
 
-    return (
-      <div className={ styles.wrapper }>
-        <OutsideClickDetectingDiv
-          onClickOutside={ this.closeMenu }
-        >
-          <div
-            onClick={ this.toggleMenu }
-            className={cn("flex items-center cursor-pointer select-none", parentStyles, { 'bg-gray-light' : displayed && label })}
-          >
-            {label && <span className={cn('mr-1', bold ? 'font-medium color-gray-darkest' : 'color-gray-medium')}>{label}</span>}
-            <div
-              ref={ (ref) => { this.menuBtnRef = ref; } }
-              className={cn("rounded-full flex items-center justify-center", { 'bg-gray-light' : displayed, "w-10 h-10" : !label })}
-              role="button"
-            >
-              <Icon name="ellipsis-v" size="16" />
-            </div>
-          </div>
-        </OutsideClickDetectingDiv>
-        <div
-          className={ cn(styles.menu, { [styles.menuDim]: !bold }) }
-          data-displayed={ displayed }
-        >
-          { items.filter(({ hidden }) => !hidden).map(({ onClick, text, icon, disabled = false, disabledMessage = '' }) => (
-            <div
-              key={ text }
-              onClick={ !disabled ? this.onClick(onClick) : () => {} }
-              className={disabled ? 'cursor-not-allowed' : ''}
-              role="menuitem"
-              tabIndex="-1"
-            >
-              <Popup
-                  delay={500}
-                  arrow
-                  title={ disabledMessage }
-                  position="left"
-                  disabled={ !disabled }
-              >
-                  <div className={cn(styles.menuItem, 'text-neutral-700', {'disabled' : disabled })}>
-                    { icon && (
-                        <div className={ styles.iconWrapper }>
-                          <Icon name={ icon } size="13" color="gray-dark" />
+        return (
+            <div className={styles.wrapper}>
+                <OutsideClickDetectingDiv onClickOutside={this.closeMenu}>
+                    <div
+                        onClick={this.toggleMenu}
+                        className={cn('flex items-center cursor-pointer select-none', parentStyles, { 'bg-gray-light': displayed && label })}
+                    >
+                        {label && <span className={cn('mr-1', bold ? 'font-medium color-gray-darkest' : 'color-gray-medium')}>{label}</span>}
+                        <div
+                            ref={(ref) => {
+                                this.menuBtnRef = ref;
+                            }}
+                            className={cn('rounded-full flex items-center justify-center', { 'bg-gray-light': displayed, 'w-10 h-10': !label })}
+                            role="button"
+                        >
+                            <Icon name="ellipsis-v" size="16" />
                         </div>
-                      )}
-                      <div>{ text }</div>
-                  </div>
-              </Popup>
+                    </div>
+                </OutsideClickDetectingDiv>
+                <div className={cn(styles.menu, { [styles.menuDim]: !bold })} data-displayed={displayed}>
+                    {items
+                        .filter(({ hidden }) => !hidden)
+                        .map(({ onClick, text, icon, disabled = false, disabledMessage = '' }) => (
+                            <div
+                                key={text}
+                                onClick={!disabled ? this.onClick(onClick) : () => {}}
+                                className={disabled ? 'cursor-not-allowed' : ''}
+                                role="menuitem"
+                                tabIndex="-1"
+                            >
+                                <div className={cn(styles.menuItem, 'text-neutral-700', { disabled: disabled })}>
+                                    {icon && (
+                                        <div className={styles.iconWrapper}>
+                                            <Icon name={icon} size="13" color="gray-dark" />
+                                        </div>
+                                    )}
+                                    <div>{text}</div>
+                                </div>
+                            </div>
+                        ))}
+                </div>
             </div>
-          ))}
-        </div>
-      </div>
-    );
-  }
+        );
+    }
 }
diff --git a/frontend/app/components/ui/Popup/Popup.tsx b/frontend/app/components/ui/Popup/Popup.tsx
index d44976b28..fba21fd4e 100644
--- a/frontend/app/components/ui/Popup/Popup.tsx
+++ b/frontend/app/components/ui/Popup/Popup.tsx
@@ -1,44 +1,57 @@
 import React from 'react';
-import { Tooltip } from 'react-tippy';
+import { Tooltip, Theme, Trigger, Position } from 'react-tippy';
 
 interface Props {
-  content?: any;
-  title?: any;
-  trigger?: any
-  position?: any
-  className?: string
-  delay?: number
-  disabled?: boolean
-  arrow?: boolean
-  open?: boolean
-  style?: any
-  [x:string]: any;
+    content?: any;
+    title?: any;
+    trigger?: Trigger;
+    position?: Position;
+    className?: string;
+    delay?: number;
+    hideDelay?: number;
+    duration?: number;
+    disabled?: boolean;
+    arrow?: boolean;
+    open?: boolean;
+    style?: any;
+    theme?: Theme;
+    interactive?: boolean;
+    children?: any;
+    // [x:string]: any;
 }
 export default ({
-  position = 'top',
-  title='',
-  className='',
-  trigger = 'mouseenter',
-  delay = 1000,
-  disabled = false,
-  arrow = true,
-  theme = 'dark',
-  style = {},
-  ...props
-}: Props) => (
-  <Tooltip
-    // {...props}
-    className={className}
-    trigger={trigger}
-    html={props.content || props.title}
-    disabled={disabled}
-    arrow={arrow}
-    delay={delay}
-    hideOnClick={true}
-    hideOnScroll={true}
-    theme={theme}
-    style={style}
-  >
-    { props.children }
-  </Tooltip>
+    position = 'top',
+    title = '',
+    className = '',
+    trigger = 'mouseenter',
+    delay = 1000,
+    hideDelay = 0,
+    content = '',
+    duration = 0,
+    disabled = false,
+    arrow = true,
+    theme = 'dark',
+    style = {},
+    interactive = false,
+    children,
+}: // ...props
+Props) => (
+    <Tooltip
+        position={position}
+        className={className}
+        trigger={trigger}
+        html={content || title}
+        disabled={disabled}
+        arrow={arrow}
+        delay={delay}
+        hideOnClick={true}
+        hideOnScroll={true}
+        theme={theme}
+        style={style}
+        interactive={interactive}
+        duration={0}
+        hideDelay={hideDelay}
+    >
+        {children}
+    </Tooltip>
 );