Changes to button
fixed git error
Started on options and select