Calendar update
Refactor grid input