Wip/calendargui

Use calendargui to update dev