Trickyness occurs because we display containers differently depending upon where they are

Hopefully @janua will be able to make this prettier soon...