Fix ordering of subviews during pop