Various usability fixes on main calendar and edit form. Implements #39