Updated form - cosmetic tweaks