Updated solution layout