Reworked object properties in preparation for the object properties menu.