fixed layout problem with order