cleaned up settings screen