Bugfix on calendar and removing unecessary spaces