More form refinements

These are minor display tweaks