Interface Cleanup & Prep for Unit Customization
Misc