Showing year in calendar
fixing conflicts
broad style changes