Restructuring nav and JS interactions