Fixed bug with buttons resizing + removed unused code
Merge branch 'kogutm' of https://github.com/monkog/Showroom into kogutm