Improve impl-blueprint layout