Refactored some units under actual Unit

Plus added graphics for helpers