Category select box refactored, tag model added