fixed first part of button error
fixed routes merge conflict