Issue and Calendar view refactoring