Update and fix default-whitehall layout