Fix Fragile Alliance button usability and Diplomacy Shroud problems

Most importantly addressing #2942.