This is more consistent and actually removes the elements from the layout.

The commit also hides the conditional elements by default, which should
be a more natural loading experience.