Fixed nav and added map