Minor form tweaks
More form cleanup