Add product code to price label, tweak layout