Updated solution. Aligned layout to match updates.