WIP: cleaning up views