fixed merge problems
Add top nav links