Integrated 2 helpers
Updated default helpers
Updated some componants