The option list is now appended to the body in a less hacky way