Support for clicking buttons, added calendar