Move call to updateButtonLayoutWidth to recreateButtonLayout()