Simplify the layout by removing useless parent