add menu links
fix conflict
landing first