Fix spelling mistake and remove option

- removes option wakup screen on charge on devices which does not have that weird behaviour by default.
- changed a bit remove logic
- spelling mistake in navbar ass menu.

cheers

Change-Id: I18e546c008bdf836ef191d9f03075e8f7f94e503