Improve indentation
Add hack for calendar arrow that disappear from the DOM