Revert "Revamp additional settings layout"

This reverts commit c507f23990c0b85ddfa5b39653a4347af60ac8d0.

Not ready yet