Update to current version

Fixed form styles to be consistent across all types