add calendar, button, fixed problems with sizing