Design adjustment + new layouts