Settings: Move Navigation buttons out of interface.

    http://imgur.com/iQi5xMg
    PS15: Move expanded desktop options to display.
    PS16: More cleanup.
    PS17: Remove whitespace.

Change-Id: I923d011cfa72a7c3fe26838032d00aaddf15a664