layout and display fix