Added ability to define unit (px or %)