Added wrappers and style for the buttons