Make container singleton.
Fix inspector sorting.