Added work on GUIs and containers