Added fluid support and the nav macro.