Refactored prototype layout