Fixed unit import pre-req issues

Also minor UI tweaks