Fixing MOAR layout