Split into two views; added router