Code cleanup
Fixed button width