Making Calendar and Form more Responsive