#10 Calendar and event bug fixing