Completed redesign to prototype style