better form formatting and fixtures