Redesign and code updates