View hierarchy fixes