Buttons repaired
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop into imp