Layout and design upgrade