cleaned up UI hierarchy.