Incorperated nrSteps in ApplicationState and wrote tests for these methods
Added code for nrSteps spinner functionality
Resolved merge conflict