Using proper layout inflation and measurement as described in #19