ironing out bugs after layout adjustment