Added return for the Container and GUI