Update form styles and match tables naming pattern