Finish Ngu Hanh and Van Trinh Redesign