Added container types and new buttons