finally fixed layout issues