Yiistraped most of views, some tiny cleanups