Revert "SysUI:  NavBar & Widgets rollup [1/2?]"

This reverts commit 84ff30eebbc03602921ae9bef7a3f4aa7ad573fb.