Merged with Jon's UI updates.  Had to fix images so they might be bad