Adding buttons logic on match form, first version