handling active category
Merge branch 'master' into ui