really fix the layout problem