Simplify constructor
Fix vertical centering for horizontal fill scaling