Fixing issues on models and controllers, got themes working