New settings screen is working with a couple of small exceptions