username and calendar week view fix