Settings: Cleanup display settings code #2