minor change for better handling of secondary calendar.
Buttons design change, and simplification in css