enhance switch view