Improve product layout #42