Implemented the sort by logic
Fixed an error in the app which shows the navigation list even when the user has not linked the account