|#789| Adding ids to buttons, fixing smoketests