added proper numbering
added numbering correction when returning to stacked view