Update Design and Fix Broken Links