Remove width from buttons

WORK IN PROGRESS