A few small tweaks, still trying to get the nav working correctly