refactor calendar views