diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 88c73b75a8..3f321d453d 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -79,7 +79,7 @@ export default React.createClass({
             }
 
             let nameNode;
-            if (summary.profile.name) {
+            if (summary.profile && summary.profile.name) {
                 nameNode = <div className="mx_RoomHeader_name">
                     <span>{summary.profile.name}</span>
                     <span className="mx_GroupView_header_groupid">
@@ -92,6 +92,8 @@ export default React.createClass({
                 </div>;
             }
 
+            const groupAvatarUrl = summary.profile ? summary.profile.avatar_url : null;
+
             return (
                 <div className="mx_GroupView">
                     <div className="mx_RoomHeader">
@@ -99,7 +101,7 @@ export default React.createClass({
                             <div className="mx_RoomHeader_avatar">
                                 <GroupAvatar
                                     groupId={this.props.groupId}
-                                    groupAvatarUrl={summary.profile.avatar_url}
+                                    groupAvatarUrl={groupAvatarUrl}
                                     width={48} height={48}
                                 />
                             </div>
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 49a2367db8..3eb694acce 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -61,9 +61,6 @@ export default withMatrixClient(React.createClass({
         this._fetch();
     },
 
-    componentWillUnmount: function() {
-    },
-
     _onCreateGroupClick: function() {
         const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
         Modal.createDialog(CreateGroupDialog);
@@ -73,7 +70,7 @@ export default withMatrixClient(React.createClass({
         this.props.matrixClient.getJoinedGroups().done((result) => {
             this.setState({groups: result.groups, error: null});
         }, (err) => {
-            this.setState({result: null, error: err});
+            this.setState({groups: null, error: err});
         });
     },
 
@@ -93,12 +90,12 @@ export default withMatrixClient(React.createClass({
                 );
             });
             content = <div>
-                <div>{_t('You are a member of these groups')}:</div>
+                <div>{_t('You are a member of these groups:')}</div>
                 {groupNodes}
             </div>;
         } else if (this.state.error) {
             content = <div className="mx_MyGroups_error">
-                Error whilst fetching joined groups
+                {_t('Error whilst fetching joined groups')}
             </div>;
         } else {
             content = <Loader />;
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index c436d938df..23194f20a5 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -130,10 +130,10 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Loader = sdk.getComponent("elements.Spinner");
+        const Spinner = sdk.getComponent('elements.Spinner');
 
         if (this.state.creating) {
-            return <Loader />;
+            return <Spinner />;
         }
 
         let createErrorNode;
@@ -154,29 +154,32 @@ export default React.createClass({
             >
                 <form onSubmit={this._onFormSubmit}>
                     <div className="mx_Dialog_content">
-                        <div className="mx_CreateGroupDialog_label">
-                            <label htmlFor="groupname">{_t('Group Name')}</label>
+                        <div className="mx_CreateGroupDialog_inputRow">
+                            <div className="mx_CreateGroupDialog_label">
+                                <label htmlFor="groupname">{_t('Group Name')}</label>
+                            </div>
+                            <div>
+                                <input id="groupname" className="mx_CreateGroupDialog_input"
+                                    autoFocus={true} size="64"
+                                    placeholder={_t('Example')}
+                                    onChange={this._onGroupNameChange}
+                                    value={this.state.groupName}
+                                />
+                            </div>
                         </div>
-                        <div>
-                            <input id="groupname" className="mx_CreateGroupDialog_input"
-                                autoFocus={true} size="64"
-                                placeholder={_t('Example')}
-                                onChange={this._onGroupNameChange}
-                                value={this.state.groupName}
-                            />
-                        </div>
-                        <br />
-                        <div className="mx_CreateGroupDialog_label">
-                            <label htmlFor="groupid">{_t('Group ID')}</label>
-                        </div>
-                        <div>
-                            <input id="groupid" className="mx_CreateGroupDialog_input"
-                                size="64"
-                                placeholder={_t('+example:%(domain)s', {domain: MatrixClientPeg.get().getDomain()})}
-                                onChange={this._onGroupIdChange}
-                                onBlur={this._onGroupIdBlur}
-                                value={this.state.groupId}
-                            />
+                        <div className="mx_CreateGroupDialog_inputRow">
+                            <div className="mx_CreateGroupDialog_label">
+                                <label htmlFor="groupid">{_t('Group ID')}</label>
+                            </div>
+                            <div>
+                                <input id="groupid" className="mx_CreateGroupDialog_input"
+                                    size="64"
+                                    placeholder={_t('+example:%(domain)s', {domain: MatrixClientPeg.get().getDomain()})}
+                                    onChange={this._onGroupIdChange}
+                                    onBlur={this._onGroupIdBlur}
+                                    value={this.state.groupId}
+                                />
+                            </div>
                         </div>
                         <div className="error">
                             {this.state.groupIdError}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6647126c28..dbef0fc7fe 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -948,9 +948,10 @@
     "Group IDs must be of the form +localpart:%(domain)s": "Group IDs must be of the form +localpart:%(domain)s",
     "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
     "Room creation failed": "Room creation failed",
-    "You are a member of these groups": "You are a member of these groups",
+    "You are a member of these groups:": "You are a member of these groups:",
     "Create a group to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Create a group to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.",
     "Join an existing group": "Join an existing group",
     "To join an exisitng group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an exisitng group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
-    "Autocomplete Delay (ms):": "Autocomplete Delay (ms):"
+    "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
+  "Error whilst fetching joined groups": "Error whilst fetching joined groups"
 }