Initial reworking of kalendar ui