adjust layout according to new design