Added primitive shapes and updated UI.Label