retab wikipedia zone and fix aligning

Change-Id: I0e48d4a4f8f186a5c03400733ccd71f7317a2cfd