refactoring again, calendar module header week navigation