Possible derp

Change-Id: I9e3890d41a1855f616dff59263b2c7e481f0d99f
Revert "Fix Signal toggle layout"

This reverts commit 6626047b9a5f9edb6348b33b38671037382574bd.
Adjust layout

Change-Id: I7076c87dcd0ee7329e1e5b09fa2e0aa365ae529a
Revert "Adjust layout"

This reverts commit 58f120a937ef41ff1bf0ec388c2f132a4ae97c58.