some change for layout problems