Better markup for options