Nav and messaging changes