Helper refactoring
Added units, css value builders