Fixed User and Categories model and edited front page query