Addressed SingleView issues.