Removed undecorated containers due to unknown layout issues