more display and ordering fixes