Tweaks to forms
Converting tabs to spaces