Minor changes, debugging for navigation
Fixed router navigation issues...Still some different errors