Reformat some files, beautiful nav