Added generic Wrapper and added background to buttons