fixes for display order