Minor fixes to the layout and display.