Add missing screens, add ScrollView for welcome screens