UI changes for layout compatibility