Another fix of layout