style changes and form bug fixes