Filter UI layout modified to reflect correct hierarchical structure.