Fixing form height issues (Closes #72)