Revert "Add expanded desktop, Nav bar settings, BatteryBar"

This reverts commit fb73d67baf9f63dfe9ee4faff262195767ed8e2f.