[2.2] Polishing Settings

Just a derped settings commit fixes - but it mixes up the messed up listview headers somewhat
More commits that finish Settings up coming soon :P

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>