some fix to layout