ScrollList & view switch fixes