diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js
index a88af181ba..a0f35e0172 100644
--- a/src/components/BrowserCell/BrowserCell.react.js
+++ b/src/components/BrowserCell/BrowserCell.react.js
@@ -243,12 +243,14 @@ export default class BrowserCell extends Component {
         value = object;
       }
       content = onPointerClick ? (
-        <a href='javascript:;' onClick={onPointerClick.bind(undefined, value)}>
-          <Pill value={value.id} />
-        </a>
+        <Pill
+          value={value.id}
+          onClick={onPointerClick.bind(undefined, value)}
+          followClick={true}
+        />
       ) : (
-          value.id
-        );
+        value.id
+      );
       this.copyableValue = value.id;
     }
     else if (type === 'Array') {
@@ -289,7 +291,7 @@ export default class BrowserCell extends Component {
       this.copyableValue = content = JSON.stringify(value);
     } else if (type === 'File') {
       const fileName = value.url() ? getFileName(value) : 'Uploading\u2026';
-      content = <Pill value={fileName} />;
+      content = <Pill value={fileName} fileDownloadLink={value.url()} />;
       this.copyableValue = fileName;
     } else if (type === 'ACL') {
       let pieces = [];
@@ -318,8 +320,8 @@ export default class BrowserCell extends Component {
       this.copyableValue = content = value.coordinates.map(coord => `(${coord})`)
     } else if (type === 'Relation') {
       content = setRelation ? (
-        <div style={{ textAlign: 'center', cursor: 'pointer' }}>
-          <Pill onClick={() => setRelation(value)} value='View relation' />
+        <div style={{ textAlign: 'center' }}>
+          <Pill onClick={() => setRelation(value)} value='View relation' followClick={true} />
         </div>
       ) : (
           'Relation'
diff --git a/src/components/Field/Field.scss b/src/components/Field/Field.scss
index 1153c1770c..116a490828 100644
--- a/src/components/Field/Field.scss
+++ b/src/components/Field/Field.scss
@@ -42,11 +42,12 @@
   min-height: 80px;
   text-align: right;
   padding: 0;
+  background: #f6fafb;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
-.input {
-  margin: 25px 20px 0 0;
-}
 
 .header {
   min-height: 56px;
@@ -56,10 +57,6 @@
     min-height: 56px;
   }
 
-  .input {
-    margin: 13px 20px 0 0;
-  }
-
   & ~ .field {
     background: #f5f5f7;
   }
diff --git a/src/components/FileEditor/FileEditor.react.js b/src/components/FileEditor/FileEditor.react.js
index dbd839ceb6..7e438a995a 100644
--- a/src/components/FileEditor/FileEditor.react.js
+++ b/src/components/FileEditor/FileEditor.react.js
@@ -26,8 +26,12 @@ export default class FileEditor extends React.Component {
   componentDidMount() {
     document.body.addEventListener('click', this.checkExternalClick);
     document.body.addEventListener('keypress', this.handleKey);
+    let fileInputElement = document.getElementById('fileInput');
+    if (fileInputElement) {
+      fileInputElement.click();
+    }
   }
-
+  
   componentWillUnmount() {
     document.body.removeEventListener('click', this.checkExternalClick);
     document.body.removeEventListener('keypress', this.handleKey);
@@ -72,13 +76,11 @@ export default class FileEditor extends React.Component {
   render() {
     const file = this.props.value;
     return (
-      <div ref='input' style={{ minWidth: this.props.width }} className={styles.editor}>
-        {file && file.url() ? <a href={file.url()} target='_blank' role='button' className={styles.download}>Download</a> : null}
+      <div ref='input' style={{ minWidth: this.props.width, display: 'none' }} className={styles.editor}>
         <a className={styles.upload}>
-          <input ref='fileInput' type='file' onChange={this.handleChange.bind(this)} />
+          <input ref='fileInput' id='fileInput' type='file' onChange={this.handleChange.bind(this)} />
           <span>{file ? 'Replace file' : 'Upload file'}</span>
         </a>
-        {file ? <a href='javascript:;' role='button' className={styles.delete} onClick={this.removeFile}>Delete</a> : null}
       </div>
     );
   }
diff --git a/src/components/Pill/Pill.react.js b/src/components/Pill/Pill.react.js
index d186bb4772..32b7cb1b43 100644
--- a/src/components/Pill/Pill.react.js
+++ b/src/components/Pill/Pill.react.js
@@ -7,9 +7,29 @@
  */
 import React  from 'react';
 import styles from 'components/Pill/Pill.scss';
+import Icon from "components/Icon/Icon.react";
+
 //TODO: refactor, may want to move onClick outside or need to make onClick able to handle link/button a11y
-let Pill = ({ value, onClick }) => (
-  <span className={[styles.pill, onClick ? styles.action : void(0)].join(' ')} onClick={onClick}>{value}</span>
+let Pill = ({ value, onClick, fileDownloadLink, followClick = false }) => (
+  <span
+    className={[
+      styles.pill,
+      !followClick && onClick ? styles.action : void 0
+    ].join(" ")}
+    onClick={!followClick && onClick ? onClick : null}
+  >
+    <span className={!followClick && fileDownloadLink ? styles.content : ''}>{value}</span>
+    {followClick && (
+      <a onClick={onClick}>
+        <Icon name="right-outline" width={20} height={20} fill="#1669a1" />
+      </a>
+    )}
+    {!followClick && fileDownloadLink && (
+      <a href={fileDownloadLink} target="_blank">
+        <Icon name="right-outline" width={20} height={20} fill="#1669a1" />
+      </a>
+    )}
+  </span>
 );
 
 export default Pill;
diff --git a/src/components/Pill/Pill.scss b/src/components/Pill/Pill.scss
index 156a633dc5..c24ca6240e 100644
--- a/src/components/Pill/Pill.scss
+++ b/src/components/Pill/Pill.scss
@@ -9,20 +9,44 @@
 
 .pill {
   @include MonospaceFont;
-  display: inline-block;
-  background: #D5E5F2;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   color: #0E69A1;
   height: 20px;
   line-height: 20px;
   border-radius: 10px;
   font-size: 11px;
-  padding: 0 8px;
   width: 100%;
-  text-align: center;
   overflow: hidden;
   text-overflow: ellipsis;
-
-  &:hover {
-    background: #BFD4E5;
+  white-space: nowrap;
+  margin-bottom: 4px;
+  & a {
+    height: 20px;
+    width: 20px;
+    background: #d6e5f2;
+    border-radius: 50%;
+    margin-left: 5px;
+    & svg  {
+      transform: rotate(316deg);
+    }
   }
 }
+
+.content {
+  width: 80%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  text-align: left;
+  height: 100%;
+  white-space: nowrap;
+}
+
+.iconAction {
+  cursor: pointer;
+}
+
+.disableIconAction {
+  cursor: initial;
+}
\ No newline at end of file
diff --git a/src/dashboard/Data/Browser/EditRowDialog.react.js b/src/dashboard/Data/Browser/EditRowDialog.react.js
index e5dbcbd348..6e31031b83 100644
--- a/src/dashboard/Data/Browser/EditRowDialog.react.js
+++ b/src/dashboard/Data/Browser/EditRowDialog.react.js
@@ -14,6 +14,7 @@ import GeoPointEditor from 'components/GeoPointEditor/GeoPointEditor.react';
 import FileEditor from 'components/FileEditor/FileEditor.react';
 import ObjectPickerDialog from 'dashboard/Data/Browser/ObjectPickerDialog.react';
 import styles from 'dashboard/Data/Browser/Browser.scss';
+import getFileName from 'lib/getFileName';
 
 export default class EditRowDialog extends React.Component {
   constructor(props) {
@@ -23,7 +24,7 @@ export default class EditRowDialog extends React.Component {
     const { currentObject, openObjectPickers, expandedTextAreas } = this.initializeState(
       selectedObject
     );
-    this.state = { currentObject, openObjectPickers, expandedTextAreas };
+    this.state = { currentObject, openObjectPickers, expandedTextAreas, showFileEditor: false };
 
     this.updateCurrentObject = this.updateCurrentObject.bind(this);
     this.handleChange = this.handleChange.bind(this);
@@ -31,6 +32,8 @@ export default class EditRowDialog extends React.Component {
     this.openPointer = this.openPointer.bind(this);
     this.toggleObjectPicker = this.toggleObjectPicker.bind(this);
     this.openRelation = this.openRelation.bind(this);
+    this.openFileEditor = this.openFileEditor.bind(this);
+    this.hideFileEditor = this.hideFileEditor.bind(this);
   }
 
   componentWillReceiveProps(props) {
@@ -216,6 +219,18 @@ export default class EditRowDialog extends React.Component {
     this.setState({ expandedTextAreas });
   }
 
+  openFileEditor() {
+    this.setState({
+      showFileEditor: true
+    });
+  }
+
+  hideFileEditor() {
+    this.setState({
+      showFileEditor: false
+    });
+  }
+
   render() {
     const { selectedObject, className, columns, onClose, schema } = this.props;
     const { currentObject, openObjectPickers, expandedTextAreas } = this.state;
@@ -247,6 +262,7 @@ export default class EditRowDialog extends React.Component {
             'restricted'
           ].indexOf(name) >= 0);
 
+      let val = currentObject[name];
       switch (type) {
         case 'String':
           inputComponent = (
@@ -257,7 +273,7 @@ export default class EditRowDialog extends React.Component {
                   : false
               }
               disabled={isDisabled}
-              placeholder={name === 'password' ? '(hidden)' : ''}
+              placeholder={name === 'password' ? '(hidden)' : val === undefined ? '(undefined)' : ''}
               value={currentObject[name]}
               onChange={newValue => this.updateCurrentObject(newValue, name)}
               onBlur={newValue => this.handleChange(newValue, name)}
@@ -269,6 +285,7 @@ export default class EditRowDialog extends React.Component {
             <TextInput
               disabled={isDisabled}
               value={currentObject[name]}
+              placeholder={val === undefined ? '(undefined)' : ''}
               onChange={newValue => this.updateCurrentObject(newValue, name)}
               onBlur={newValue => this.handleChange(parseFloat(newValue), name)}
             />
@@ -286,6 +303,7 @@ export default class EditRowDialog extends React.Component {
                 expandedTextAreas[name].rows
               }
               disabled={isDisabled}
+              placeholder={val === undefined && '(undefined)'}
               value={currentObject[name]}
               onChange={newValue => this.updateCurrentObject(newValue, name)}
               onBlur={newValue =>
@@ -296,7 +314,7 @@ export default class EditRowDialog extends React.Component {
           break;
         case 'Boolean':
           inputComponent = isDisabled ? (
-            <TextInput disabled={true} value={selectedObject[name]} />
+            <TextInput disabled={true} placeholder={val === undefined && '(undefined)'} value={selectedObject[name]} />
           ) : (
             <Toggle
               type={Toggle.Types.TRUE_FALSE}
@@ -327,13 +345,24 @@ export default class EditRowDialog extends React.Component {
           );
           break;
         case 'File':
+          let file = selectedObject[name];
+          let fileName = file && file.url() ? getFileName(file) : '';
           inputComponent = (
             <div style={{ padding: '25px' }}>
-              <FileEditor
-                value={selectedObject[name]}
-                style={{ position: 'inherit' }}
-                onCommit={newValue => this.handleChange(newValue, name)}
-              />
+              {file && <Pill value={fileName} fileDownloadLink={file.url()} />}
+              <div style={{ cursor: 'pointer' }}>
+                <Pill
+                  value={file ? 'Change file' : 'Select file'}
+                  onClick={() => this.openFileEditor()}
+                />
+                {this.state.showFileEditor && (
+                  <FileEditor
+                    value={file}
+                    onCancel={this.hideFileEditor}
+                    onCommit={newValue => this.handleChange(newValue, name)}
+                  />
+                )}
+              </div>
             </div>
           );
           break;
@@ -362,6 +391,7 @@ export default class EditRowDialog extends React.Component {
                 <Pill
                   onClick={() => this.openPointer(targetClass, pointerId)}
                   value={pointerId}
+                  followClick={true}
                 />
               )}
               <Pill
@@ -400,6 +430,7 @@ export default class EditRowDialog extends React.Component {
                 <Pill
                   onClick={() => this.openRelation(relation)}
                   value={`View ${type}`}
+                  followClick={true}
                 />
                 <Pill
                   onClick={() => this.toggleObjectPicker(name, true)}
diff --git a/src/icons/right-outline.svg b/src/icons/right-outline.svg
index 28d82c5965..aad9e17e84 100644
--- a/src/icons/right-outline.svg
+++ b/src/icons/right-outline.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M50 100C22.43 100 0 77.57 0 50S22.43 0 50 0s50 22.43 50 50-22.43 50-50 50zm0-91.903C26.894 8.097 8.097 26.894 8.097 50S26.894 91.903 50 91.903 91.903 73.106 91.903 50 73.106 8.097 50 8.097z"/><path d="M50.854 37.92L57.267 44H25v11h32.266l-6.412 7.08 8.016 8.015L78.965 50 58.87 29.905"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="M50.854 37.92L57.267 44H25v11h32.266l-6.412 7.08 8.016 8.015L78.965 50 58.87 29.905"/>
+</svg>
\ No newline at end of file