fix nab links, remove no ajaxify on links, 
functioning as expected, next >> merge with 
development