Made more progress on settings and welcome screen