Fixed lines to center on points
Added arrange template