Added mapping and changed nav