Minor armor and GUI tweaks.