fixed buttons width and layout; + removed unused local variable