Revert "Single pane for 10" Settings"

    This reverts commit 56f51a8927f53bee81145fe29e63af8a87e6fd1b.
    + Fix fragments
    + layout

Change-Id: I3171d2bbe55b314e32c223e4cf44e043b47fcf6b