Register and Calendar view refactoring