Minor display/layout improvements