*fixed layout issues