switched to 0.5.7
refactoring categories helper
refactored categories helper, fixed conflicts