Refactor views
Add user calendar