Categorize Oct settings and move battery icon

into statusbar settings menu