Z-index tweaks

Put the hidden stuff behind the non-hidden stuff.