MOD: Moved js to the end of layout; updated Vehicle form