Separate Settings into Profile and Settings, update Welcome screen