Cleanups of parameter back-and-forth
Refactor: object/layer displays pt 1 (broken right now)