Revert "Derp"

This reverts commit 505d937f36e2cfaed28874de8f61bd802c7e2594.
Revert "move appbar for now"

This reverts commit 3ccca403fc225f93f6b692e2a8fa6da5a25ff7ff.
Revert "maybe a derp"

This reverts commit 663d290bdd530c499f1c610dd65c0018a7f555c8.
Revert "Appbar changes to compile and work with new CM "Display Settings: Better font size control" commit"

This reverts commit 8240f936c496aed2b1044e232b2fa436b53ca203.
Revert "App sidebar [2/2]"

This reverts commit 1c6d89cb74cea0eb5daafab60e053a0a4caa105a.