Merge the option button

Signed-off-by: xclam <romain.rj@gmail.com>