Clean up entity creation buttons