Increase consistency for close button/red x across all forms