Fix button settings layout derp

Change-Id: I9fb643bfcaab902834958cf37c6e983075e14226
Fix more button settings derps

Change-Id: Ib614977a66f2627d111fccc28377e79f8c7c5a45