corrected calendar and buttons