fix of layout issues