Improve form margins, espeically for user forms. Refs #54