Misc code cleanup

Signed-off-by: Ramón Ramos <arathael@gmail.com>
UI Navistar Card, Misc bugs

Signed-off-by: Ramón Ramos <arathael@gmail.com>