Server updates May 23 - Fixed issues with menu