Switched to 2 column form style