Use categories data
UI Tweaks
Fix JSHint