updated data classes and navigation binnder