more update on layout adjustment