fixed nav (hopefully) and re-arranged links