Repaired the broken view hierarchy