diff --git a/webapp/pages/board.jsx b/webapp/pages/board.jsx
index b91d2b9..2dc9c44 100644
--- a/webapp/pages/board.jsx
+++ b/webapp/pages/board.jsx
@@ -46,13 +46,14 @@ module.exports = function (boardsAPI) {
         }
       })
     },
-    init (boards) {
-      if (!this.state.init) {
-        if (this.props.params.userid) {
-          boards.getBoardSettings(this.props.params.userid, this.props.params.boardname)
-        }
-        this.setState({ init: true, api: true, boards: boards })
-      }
+    componentWillReceiveProps (props) {
+      boardsAPI.use(b => this.init(b, props))
+    },
+    init (boards, newProps) {
+      var props = newProps || this.props
+      if (!props.params.userid) return
+      boards.getBoardSettings(props.params.userid, props.params.boardname)
+      this.setState({ loading: true, init: true, api: true, userid: boards.getMyID(), boards: boards })
     },
     toolbox () {
       return <div className="iconbar text-center">
@@ -63,7 +64,11 @@ module.exports = function (boardsAPI) {
     render () {
       if (this.state.api) {
         if (this.state.loading) {
-          return <Loading title="Downloading Board data" />
+          return <Loading title="Downloading Board data">
+            { this.props.params.userid === 'me' || this.props.params.userid === this.state.userid
+              ? <Link to={'/edit/board/' + this.props.params.boardname} className="button button-primary">Edit Board</Link>
+              : <span></span> }
+          </Loading>
         } else {
           return (<div className="board">
             <h2>{this.state.name}</h2>
diff --git a/webapp/pages/post-editor.jsx b/webapp/pages/post-editor.jsx
index 08e21e5..78f4e6f 100644
--- a/webapp/pages/post-editor.jsx
+++ b/webapp/pages/post-editor.jsx
@@ -24,7 +24,7 @@ module.exports = function (boardsAPI) {
     },
     init (boards) {
       if (this.state.init) return
-      this.setState({ api: boards, init: true })
+      this.setState({ api: boards, userid: boards.getMyID(), init: true })
       if (this.props.params.posthash) this.downloadPost(boards)
     },
     downloadPost (boards) {
@@ -88,6 +88,9 @@ module.exports = function (boardsAPI) {
             <button className="button button-primary center-block" onClick={this.skip}>Skip</button>
           </Saving>
         } else {
+          if (this.state.userid && this.props.params.boardname) {
+            var boardurl = '/@' + this.state.userid + '/' + this.props.params.boardname
+          }
           return (
             <div className="editor">
               <h2><Icon name="pencil" className="light" />
@@ -109,6 +112,7 @@ module.exports = function (boardsAPI) {
               </div>
               <div className="buttons">
                 <button className="button button-primary" onClick={this.save}>Publish</button>
+                {boardurl ? <Link className="button not-first" to={boardurl}>View Board</Link> : <span></span> }
                 {this.additionalButtons()}
               </div>
             </div>