Added new custom containers and objects
GUIs now use new objects and containers