Making histogram alignment easier to control

Fix #669