Created Definition container for display, fixed others after most recent database change