Layout

Some adjustment