Added more config and a navigation class