Cleaned up settings UX code yayyy