Calender bugfix, button bugfix to go