Reorder otions and validation, fill out much more