Added PrimitiveDrawable to UI. Fix mistakes Primitive auxiliar functions.