Touchups to forms+editing views
Template readability touchups