Misc view cleanups