Add calendar events edit action and refactor new action
Modify main layout