Settings: Fix and cleanup
Settings: Custom header item