renames some styles and fixes local nav order