fixed category bug and category display
merge category bug fix