moving out step navigation and indexes to decorator