linked the two views together
Merge pull request #273 from willchen90/master

linked the two views together (closes #203 and #214)