Code Refactor
Added SpinnerNavigation