Added calendar select

Alongside miscellaneous code cleanup.