Minor cleanup of some display functions
Merge branch 'master' into dataset
WIP: controllers/views for container/slot

Start on asset controllers.  Broken.