Link API in Nav, other UI tweaks