Fix routing and user model