Changed element setting to container and disabled swap mode