Make Wham layout undependent