[add] layout improvements