more tweaks to layout and display