Refactor the status bar to act more like CM10.1