layout adjustment and cleanup