Small bugfix and refactoring
No wasted space in product headers