Fixed bug with buttons resizing + removed unused code