Tighten up open/close logic
Removed unused state var
Checkpoint - calendar dropdown