started to intergrate new button handling using XML