Some cleaning and fixing centering
Updated demo and control
Height fix