diff --git a/app/data/members.json b/app/data/members.json
index ecc4f68..cac55b5 100644
--- a/app/data/members.json
+++ b/app/data/members.json
@@ -11,22 +11,22 @@
       "government": {
         "title": "Government & Forums",
         "items": [
-          { "name": "APNIC", "logo": "/assets/img/gov & forums/APNIC.png", "subtitle": "Asia-Pacific Network Information Centre" },
-          { "name": "VNNIC", "logo": "/assets/img/gov & forums/VNNIC.png", "subtitle": "Vietnam Internet Network Information Center" },
-          { "name": "IPv6 Forum", "logo": "/assets/img/gov & forums/IPv6 Forum.png", "subtitle": "Global IPv6 Forum" },
-          { "name": "APAN", "logo": "/assets/img/gov & forums/APAN.png", "subtitle": "Asia Pacific Advanced Network" },
-          { "name": "Bharat IPv6 Forum", "logo": "/assets/img/gov & forums/Bharat IPv6 Forum.jpg", "subtitle": "India IPv6 Forum" },
-          { "name": "IDNIC", "logo": "/assets/img/gov & forums/IDNIC.png", "subtitle": "Indonesian Network Information Center" },
-          { "name": "ISOC Kazakhstan", "logo": "/assets/img/gov & forums/ISOC Kazakhstan.png", "subtitle": "Internet Society Kazakhstan Chapter" },
-          { "name": "ITU-APT", "logo": "/assets/img/gov & forums/ITU-APT.jpg", "subtitle": "ITU-APT Foundation of India" },
-          { "name": "LANIC", "logo": "/assets/img/gov & forums/LANIC.jpg", "subtitle": "Laos National Internet Centre" },
-          { "name": "Malawi Revenue Authority", "logo": "/assets/img/gov & forums/Malawi Revenue Authority.jpg", "subtitle": "Malawi Revenue Authority" },
-          { "name": "NAv6", "logo": "/assets/img/gov & forums/NAv6.jpg", "subtitle": "National Advanced IPv6 Centre" },
-          { "name": "NIDA", "logo": "/assets/img/gov & forums/NIDA.png", "subtitle": "National Institute of Development Administration" },
-          { "name": "NIXI", "logo": "/assets/img/gov & forums/NIXI.png", "subtitle": "National Internet Exchange of India" },
-          { "name": "TRC Sri Lanka", "logo": "/assets/img/gov & forums/TRC Sri Lanka.png", "subtitle": "Telecommunications Regulatory Commission of Sri Lanka" },
-          { "name": "World Broadband Association", "logo": "/assets/img/gov & forums/World Broadband Association.png", "subtitle": "World Broadband Association" },
-          { "name": "APJII", "logo": "/assets/img/gov & forums/APJII.png", "subtitle": "Indonesia Internet Service Provider Association" }
+          { "name": "APNIC", "logo": "/assets/img/gov-forums/APNIC.png", "subtitle": "Asia-Pacific Network Information Centre" },
+          { "name": "VNNIC", "logo": "/assets/img/gov-forums/VNNIC.png", "subtitle": "Vietnam Internet Network Information Center" },
+          { "name": "IPv6 Forum", "logo": "/assets/img/gov-forums/IPv6-Forum.png", "subtitle": "Global IPv6 Forum" },
+          { "name": "APAN", "logo": "/assets/img/gov-forums/APAN.png", "subtitle": "Asia Pacific Advanced Network" },
+          { "name": "Bharat IPv6 Forum", "logo": "/assets/img/gov-forums/Bharat-IPv6-Forum.jpg", "subtitle": "India IPv6 Forum" },
+          { "name": "IDNIC", "logo": "/assets/img/gov-forums/IDNIC.png", "subtitle": "Indonesian Network Information Center" },
+          { "name": "ISOC Kazakhstan", "logo": "/assets/img/gov-forums/ISOC-Kazakhstan.png", "subtitle": "Internet Society Kazakhstan Chapter" },
+          { "name": "ITU-APT", "logo": "/assets/img/gov-forums/ITU-APT.jpg", "subtitle": "ITU-APT Foundation of India" },
+          { "name": "LANIC", "logo": "/assets/img/gov-forums/LANIC.jpg", "subtitle": "Laos National Internet Centre" },
+          { "name": "Malawi Revenue Authority", "logo": "/assets/img/gov-forums/Malawi-Revenue-Authority.jpg", "subtitle": "Malawi Revenue Authority" },
+          { "name": "NAv6", "logo": "/assets/img/gov-forums/NAv6.jpg", "subtitle": "National Advanced IPv6 Centre" },
+          { "name": "NIDA", "logo": "/assets/img/gov-forums/NIDA.png", "subtitle": "National Institute of Development Administration" },
+          { "name": "NIXI", "logo": "/assets/img/gov-forums/NIXI.png", "subtitle": "National Internet Exchange of India" },
+          { "name": "TRC Sri Lanka", "logo": "/assets/img/gov-forums/TRC-Sri-Lanka.png", "subtitle": "Telecommunications Regulatory Commission of Sri Lanka" },
+          { "name": "World Broadband Association", "logo": "/assets/img/gov-forums/World-Broadband-Association.png", "subtitle": "World Broadband Association" },
+          { "name": "APJII", "logo": "/assets/img/gov-forums/APJII.png", "subtitle": "Indonesia Internet Service Provider Association" }
         ]
       },
       "universities": {
diff --git a/app/data/members.vi.json b/app/data/members.vi.json
index 49dbc65..a3e72b6 100644
--- a/app/data/members.vi.json
+++ b/app/data/members.vi.json
@@ -11,22 +11,22 @@
       "government": {
         "title": "Chính Phủ & Cơ Quan Quản Lý",
         "items": [
-          { "name": "APNIC", "logo": "/assets/img/gov & forums/APNIC.png", "subtitle": "Asia-Pacific Network Information Centre" },
-          { "name": "VNNIC", "logo": "/assets/img/gov & forums/VNNIC.png", "subtitle": "Vietnam Internet Network Information Center" },
-          { "name": "IPv6 Forum", "logo": "/assets/img/gov & forums/IPv6 Forum.png", "subtitle": "Global IPv6 Forum" },
-          { "name": "APAN", "logo": "/assets/img/gov & forums/APAN.png", "subtitle": "Asia Pacific Advanced Network" },
-          { "name": "Bharat IPv6 Forum", "logo": "/assets/img/gov & forums/Bharat IPv6 Forum.jpg", "subtitle": "India IPv6 Forum" },
-          { "name": "IDNIC", "logo": "/assets/img/gov & forums/IDNIC.png", "subtitle": "Indonesian Network Information Center" },
-          { "name": "ISOC Kazakhstan", "logo": "/assets/img/gov & forums/ISOC Kazakhstan.png", "subtitle": "Internet Society Kazakhstan Chapter" },
-          { "name": "ITU-APT", "logo": "/assets/img/gov & forums/ITU-APT.jpg", "subtitle": "ITU-APT Foundation of India" },
-          { "name": "LANIC", "logo": "/assets/img/gov & forums/LANIC.jpg", "subtitle": "Laos National Internet Centre" },
-          { "name": "Malawi Revenue Authority", "logo": "/assets/img/gov & forums/Malawi Revenue Authority.jpg", "subtitle": "Malawi Revenue Authority" },
-          { "name": "NAv6", "logo": "/assets/img/gov & forums/NAv6.jpg", "subtitle": "National Advanced IPv6 Centre" },
-          { "name": "NIDA", "logo": "/assets/img/gov & forums/NIDA.png", "subtitle": "National Institute of Development Administration" },
-          { "name": "NIXI", "logo": "/assets/img/gov & forums/NIXI.png", "subtitle": "National Internet Exchange of India" },
-          { "name": "TRC Sri Lanka", "logo": "/assets/img/gov & forums/TRC Sri Lanka.png", "subtitle": "Telecommunications Regulatory Commission of Sri Lanka" },
-          { "name": "World Broadband Association", "logo": "/assets/img/gov & forums/World Broadband Association.png", "subtitle": "World Broadband Association" },
-          { "name": "APJII", "logo": "/assets/img/gov & forums/APJII.png", "subtitle": "Indonesia Internet Service Provider Association" }
+          { "name": "APNIC", "logo": "/assets/img/gov-forums/APNIC.png", "subtitle": "Asia-Pacific Network Information Centre" },
+          { "name": "VNNIC", "logo": "/assets/img/gov-forums/VNNIC.png", "subtitle": "Vietnam Internet Network Information Center" },
+          { "name": "IPv6 Forum", "logo": "/assets/img/gov-forums/IPv6-Forum.png", "subtitle": "Global IPv6 Forum" },
+          { "name": "APAN", "logo": "/assets/img/gov-forums/APAN.png", "subtitle": "Asia Pacific Advanced Network" },
+          { "name": "Bharat IPv6 Forum", "logo": "/assets/img/gov-forums/Bharat-IPv6-Forum.jpg", "subtitle": "India IPv6 Forum" },
+          { "name": "IDNIC", "logo": "/assets/img/gov-forums/IDNIC.png", "subtitle": "Indonesian Network Information Center" },
+          { "name": "ISOC Kazakhstan", "logo": "/assets/img/gov-forums/ISOC-Kazakhstan.png", "subtitle": "Internet Society Kazakhstan Chapter" },
+          { "name": "ITU-APT", "logo": "/assets/img/gov-forums/ITU-APT.jpg", "subtitle": "ITU-APT Foundation of India" },
+          { "name": "LANIC", "logo": "/assets/img/gov-forums/LANIC.jpg", "subtitle": "Laos National Internet Centre" },
+          { "name": "Malawi Revenue Authority", "logo": "/assets/img/gov-forums/Malawi-Revenue-Authority.jpg", "subtitle": "Malawi Revenue Authority" },
+          { "name": "NAv6", "logo": "/assets/img/gov-forums/NAv6.jpg", "subtitle": "National Advanced IPv6 Centre" },
+          { "name": "NIDA", "logo": "/assets/img/gov-forums/NIDA.png", "subtitle": "National Institute of Development Administration" },
+          { "name": "NIXI", "logo": "/assets/img/gov-forums/NIXI.png", "subtitle": "National Internet Exchange of India" },
+          { "name": "TRC Sri Lanka", "logo": "/assets/img/gov-forums/TRC-Sri-Lanka.png", "subtitle": "Telecommunications Regulatory Commission of Sri Lanka" },
+          { "name": "World Broadband Association", "logo": "/assets/img/gov-forums/World-Broadband-Association.png", "subtitle": "World Broadband Association" },
+          { "name": "APJII", "logo": "/assets/img/gov-forums/APJII.png", "subtitle": "Indonesia Internet Service Provider Association" }
         ]
       },
       "universities": {
diff --git a/public/assets/img/gov & forums/APAN.png b/public/assets/img/gov-forums/APAN.png
similarity index 100%
rename from public/assets/img/gov & forums/APAN.png
rename to public/assets/img/gov-forums/APAN.png
diff --git a/public/assets/img/gov & forums/APJII.png b/public/assets/img/gov-forums/APJII.png
similarity index 100%
rename from public/assets/img/gov & forums/APJII.png
rename to public/assets/img/gov-forums/APJII.png
diff --git a/public/assets/img/gov & forums/APNIC.png b/public/assets/img/gov-forums/APNIC.png
similarity index 100%
rename from public/assets/img/gov & forums/APNIC.png
rename to public/assets/img/gov-forums/APNIC.png
diff --git a/public/assets/img/gov & forums/Bharat IPv6 Forum.jpg b/public/assets/img/gov-forums/Bharat-IPv6-Forum.jpg
similarity index 100%
rename from public/assets/img/gov & forums/Bharat IPv6 Forum.jpg
rename to public/assets/img/gov-forums/Bharat-IPv6-Forum.jpg
diff --git a/public/assets/img/gov & forums/IDNIC.png b/public/assets/img/gov-forums/IDNIC.png
similarity index 100%
rename from public/assets/img/gov & forums/IDNIC.png
rename to public/assets/img/gov-forums/IDNIC.png
diff --git a/public/assets/img/gov & forums/IPv6 Forum.png b/public/assets/img/gov-forums/IPv6-Forum.png
similarity index 100%
rename from public/assets/img/gov & forums/IPv6 Forum.png
rename to public/assets/img/gov-forums/IPv6-Forum.png
diff --git a/public/assets/img/gov & forums/ISOC Kazakhstan.png b/public/assets/img/gov-forums/ISOC-Kazakhstan.png
similarity index 100%
rename from public/assets/img/gov & forums/ISOC Kazakhstan.png
rename to public/assets/img/gov-forums/ISOC-Kazakhstan.png
diff --git a/public/assets/img/gov & forums/ITU-APT.jpg b/public/assets/img/gov-forums/ITU-APT.jpg
similarity index 100%
rename from public/assets/img/gov & forums/ITU-APT.jpg
rename to public/assets/img/gov-forums/ITU-APT.jpg
diff --git a/public/assets/img/gov & forums/LANIC.jpg b/public/assets/img/gov-forums/LANIC.jpg
similarity index 100%
rename from public/assets/img/gov & forums/LANIC.jpg
rename to public/assets/img/gov-forums/LANIC.jpg
diff --git a/public/assets/img/gov & forums/Malawi Revenue Authority.jpg b/public/assets/img/gov-forums/Malawi-Revenue-Authority.jpg
similarity index 100%
rename from public/assets/img/gov & forums/Malawi Revenue Authority.jpg
rename to public/assets/img/gov-forums/Malawi-Revenue-Authority.jpg
diff --git a/public/assets/img/gov & forums/NAv6.jpg b/public/assets/img/gov-forums/NAv6.jpg
similarity index 100%
rename from public/assets/img/gov & forums/NAv6.jpg
rename to public/assets/img/gov-forums/NAv6.jpg
diff --git a/public/assets/img/gov & forums/NIDA.png b/public/assets/img/gov-forums/NIDA.png
similarity index 100%
rename from public/assets/img/gov & forums/NIDA.png
rename to public/assets/img/gov-forums/NIDA.png
diff --git a/public/assets/img/gov & forums/NIXI.png b/public/assets/img/gov-forums/NIXI.png
similarity index 100%
rename from public/assets/img/gov & forums/NIXI.png
rename to public/assets/img/gov-forums/NIXI.png
diff --git a/public/assets/img/gov & forums/TRC Sri Lanka.png b/public/assets/img/gov-forums/TRC-Sri-Lanka.png
similarity index 100%
rename from public/assets/img/gov & forums/TRC Sri Lanka.png
rename to public/assets/img/gov-forums/TRC-Sri-Lanka.png
diff --git a/public/assets/img/gov & forums/VNNIC.png b/public/assets/img/gov-forums/VNNIC.png
similarity index 100%
rename from public/assets/img/gov & forums/VNNIC.png
rename to public/assets/img/gov-forums/VNNIC.png
diff --git a/public/assets/img/gov & forums/World Broadband Association.png b/public/assets/img/gov-forums/World-Broadband-Association.png
similarity index 100%
rename from public/assets/img/gov & forums/World Broadband Association.png
rename to public/assets/img/gov-forums/World-Broadband-Association.png