Various Design detail updated