Added navigation and edited text