Added navigation and name