diff --git a/jams-react-client/src/components/Drawer/Drawer.js b/jams-react-client/src/components/Drawer/Drawer.js
index 293bc95bf68c94887b10cb5db6d357d64b5d52a0..267c939ac7db6ce3b51db304abd27fb254616de0 100644
--- a/jams-react-client/src/components/Drawer/Drawer.js
+++ b/jams-react-client/src/components/Drawer/Drawer.js
@@ -13,12 +13,18 @@ import noProfilePicture from "assets/img/faces/no-profile-picture.png";
 
 import { debounce } from "lodash";
 
-const useStyles = makeStyles({
+const useStyles = makeStyles((theme) => ({
   list: {
     width: "100%",
+    [theme.breakpoints.up("xl")]: {
+      width: "400px",
+    }
   },
   fullList: {
     width: "100%",
+    [theme.breakpoints.up("xl")]: {
+      width: "400px",
+    }
   },
   search: {
     width: "100%",
@@ -27,19 +33,18 @@ const useStyles = makeStyles({
     marginLeft: "5px",
     marginRight: "5px",
   },
-});
+}));
 
 export default function TemporaryDrawer(props) {
   const classes = useStyles();
 
   useEffect(() => {
-      console.log(props.targets)
   }, []);
 
 
   const listUsers = () => (
     <List>
-      {props.type === "user" ? props.targets.map((target) => (
+      {props.type === "user" ? ( props.targets && props.targets.map((target) => (
         <ListItem
           button
           key={target.username}
@@ -67,7 +72,7 @@ export default function TemporaryDrawer(props) {
             }
           />
         </ListItem>
-      )) : props.targets.map((target) => (      
+      ))) : ( props.targets && props.targets.map((target) => (      
         <ListItem
           button
           key={target.name}
@@ -80,7 +85,7 @@ export default function TemporaryDrawer(props) {
             primary={target.name}
           />
         </ListItem>
-      ))}
+      )))}
     </List>
   );
 
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
index 8b416f4cf179402476a6a6b55d371e21136ba97b..06f9b416785086f917937fd9f7521e3012a402c8 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
@@ -191,15 +191,21 @@ export default function DisplayUserProfile(props) {
       )
     )
       .then((response) => {
-        if(response.data.length > 1) setGroups(response.data);
-        else setGroups([response.data])
+        setGroups(response.data);
       })
       .catch((error) => {
-        console.log(error);
-        if (error.response.status === 401) {
-          auth.authenticated = false;
-          history.push("/");
+        if (error.response) {
+          if (error.response.status === 401) {
+            auth.authenticated = false;
+            history.push("/");
+          }else {
+            setGroups([]);
+            console.log(error.response);
+          }
+        } else {
+          setGroups([]);
         }
+ 
       });
   }
 
@@ -215,7 +221,7 @@ export default function DisplayUserProfile(props) {
       
       let url = "";
       let oldGroup = response.data.name;
-      if (response.blueprint == null) {
+      if (response.data.blueprint == null) {
         url =
           api_path_put_update_group +
           "?groupName=" +
@@ -232,7 +238,7 @@ export default function DisplayUserProfile(props) {
           "&newName=" +
           response.data.name +
           "&blueprintName=" +
-          group.data.blueprint +
+          response.data.blueprint +
           "&groupMembers=" +
           [props.username];
       }
@@ -283,7 +289,9 @@ export default function DisplayUserProfile(props) {
             )
               .then((response) => {
                 setUser(response.data);
-                if(response.data.groupMemberships == [""]) setGroupMemberships([])
+                if(response.data.groupMemberships.length === 1 && response.data.groupMemberships[0] === "") {
+                  setGroupMemberships([]);
+                }
                 else setGroupMemberships(response.data.groupMemberships)
                 searchGroups("*")
                 setLoading(false);
@@ -319,7 +327,10 @@ export default function DisplayUserProfile(props) {
             )
               .then((response) => {
                 setUser(response.data);
-                setGroupMemberships(response.data.groupMemberships)
+                if(response.data.groupMemberships.length === 1 && response.data.groupMemberships[0] === "") {
+                  setGroupMemberships([]);
+                }
+                else setGroupMemberships(response.data.groupMemberships)
                 setLoading(false);
               })
               .catch((error) => {
@@ -604,7 +615,7 @@ export default function DisplayUserProfile(props) {
                         </TableRow>
                     </TableHead>
                     <TableBody>
-                        {groupMemberships.map(group =>
+                        {groupMemberships !== [""] && groupMemberships.map(group =>
                             <TableRow key={group} className={classes.tableRow}>
                                 <TableCell className={tableCellClasses}>
                                     {group}