Thang changes for layout fix