diff --git a/content/about-us/office.md b/content/about-us/office.md
index 95e3ba1b..333f48a9 100644
--- a/content/about-us/office.md
+++ b/content/about-us/office.md
@@ -5,12 +5,27 @@ template = "page.html"
 +++
 
 
+##### Main office
+
+**M-Labs Limited**
+
+Unit 7, 21/F Kodak House II, 39 Healthy Street East, North Point
+
+In Chinese: 北角健康東街39號 柯達大廈二座 21樓7號房 右邊（2107）
+
+**Tel:** +852 65873703 or +852 51373772
+
+##### Public transport
+
+**MTR:** Island Line, Quarry Bay, exit C
+
+**Tramway:** Healthy Street East
+
+**Bus:** Kodak House / North Point Government Office / North Point Fire Station / Healthy Village; King's Road
 
 {% layout_text_img(src="images/map@2x.jpg", alt="", textleft=true, shadow=false) %}
 
-##### Address
-
-**M-Labs Limited**
+##### Workshop
 
 G/F Kam Hoi Mansion, 31 Pan Hoi Street, Quarry Bay, Hong Kong
 
@@ -18,15 +33,13 @@ This is part of the building complex numbered 15-53A on the street entrance.
 
 In Chinese: 香港鰂魚涌濱海街31號金海大廈G字樓
 
-**Tel:** +852 65873703 or +852 51373772
+Public transport to the workshop:
 
-##### Public transport
+MTR: Island Line, Quarry Bay, exit A
 
-**MTR:** Island Line, Quarry Bay, exit A
+Tramway: Mount Parker Road
 
-**Tramway:** Mount Parker Road
-
-**Bus:** Sunway Gardens / Westlands Road / Pan Hoi Street
+Bus: Sunway Gardens / Westlands Road / Pan Hoi Street
 
 Those transportation options take you to King's Road, then see the directions below.
 
diff --git a/templates/shortcodes/layout_flex_office_direction.html b/templates/shortcodes/layout_flex_office_direction.html
index 094f5cfc..00af9547 100644
--- a/templates/shortcodes/layout_flex_office_direction.html
+++ b/templates/shortcodes/layout_flex_office_direction.html
@@ -30,7 +30,7 @@
 
       <div>
 
-        <span class="badge badge-primary">3</span> Turn right here, walk a little bit, and M-Labs will be on your left:
+        <span class="badge badge-primary">3</span> Turn right here, walk a little bit, and the workshop will be on your left:
 
       </div>