Merge illi-kun's new vehicle UI with the other new system.

they both seem to work fine and expand correctly.

used almost all the code changes from both, it really was a crazy hybrid merge.

EDIT: also merged the border colour PR as it conflicted.