Add vehicle + jsp refactoring