Just change the order

Per-app-Layout, and then, Per-app-Expand. Better, no ? :)