Added 'back' button
Fixed link in the navigation