Bug fixes re: Add game UI, and other improvements