removed category image logic + fixed a couple of bugs