View context switching fixes