Refactor some reservation views. Closes #12