Fixed performance issue with First button, context bar now shows correct steps