Misc view cleanup