Added calendar settings WIP on related functions