layout adjustment fixes