finally fix the layout