Quick commit before refactoring
Fixed the model
Basic enhancements on Service and Category views/controllers