Change vehicle controller and company user page
Fix conflicts