feat: Add more container options, refactor edit function

From Claudyus's repository