Edit calendar and dropdown
Merge branch 'test' into dev