moat layout changes