4 files changed, 6 insertions, 3 deletions
diff --git a/frontend/views/page/components/page.header.js b/frontend/views/page/components/page.header.js
index a6c47ee..3eff339 100644
--- a/frontend/views/page/components/page.header.js
+++ b/frontend/views/page/components/page.header.js
@@ -9,7 +9,7 @@ function PageHeader(props) {
   return (
     <header>
       <div>
-        <Link to="/" className="logo"><b>{props.site.siteTitle}</b></Link>
+        <Link to={props.graph.show.res ? "/" + props.graph.show.res.path : "/"} className="logo"><b>{props.site.siteTitle}</b></Link>
       </div>
       <div>
         <button onClick={() => props.pageActions.showAddTileForm()}>+ Add tile</button>
@@ -21,6 +21,7 @@ function PageHeader(props) {
 const mapStateToProps = (state) => ({
   // auth: state.auth,
   site: state.site,
+  graph: state.graph,
   // isAuthenticated: state.auth.isAuthenticated,
 })
 
diff --git a/frontend/views/page/components/tile.edit.js b/frontend/views/page/components/tile.edit.js
index 3420505..6d8d835 100644
--- a/frontend/views/page/components/tile.edit.js
+++ b/frontend/views/page/components/tile.edit.js
@@ -36,6 +36,7 @@ class TileEdit extends Component {
       <TileForm
         data={show.res}
         graph={this.props.graph.show.res}
+        page={this.props.page.show.res}
         onSubmit={this.handleSubmit.bind(this)}
       />
     )
diff --git a/frontend/views/page/components/tile.form.js b/frontend/views/page/components/tile.form.js
index 1e75cd8..6b9d0a7 100644
--- a/frontend/views/page/components/tile.form.js
+++ b/frontend/views/page/components/tile.form.js
@@ -25,7 +25,7 @@ export default class TileForm extends Component {
   }
 
   componentDidMount() {
-    const { graph, data, isNew } = this.props
+    const { graph, page, data, isNew } = this.props
     const title = isNew ? 'new tile' : 'editing ' + data.title
     const submitTitle = isNew ? "Create Tile" : "Save Changes"
     this.setState({
@@ -33,7 +33,7 @@ export default class TileForm extends Component {
       submitTitle,
       errorFields: new Set([]),
       data: { 
-        ...newTile({ graph_id: graph.id }),
+        ...newTile({ graph_id: graph.id, page_id: page.id }),
         ...data,
       },
     })
diff --git a/frontend/views/page/components/tile.new.js b/frontend/views/page/components/tile.new.js
index 7445f27..cb5eaa8 100644
--- a/frontend/views/page/components/tile.new.js
+++ b/frontend/views/page/components/tile.new.js
@@ -28,6 +28,7 @@ class TileNew extends Component {
       <TileForm
         isNew
         graph={this.props.graph.show.res}
+        page={this.props.page.show.res}
         data={{}}
         onSubmit={this.handleSubmit.bind(this)}
       />