Refactor Highway model and controller
Fix routes