Lergo -100 : Improve saving indication 
Improve Steps UI as well