- UI Added to select to/from unit
- Other minor UI changes