Solve layout issues