Added buttons, events and resources