Improved Encounter Menu


One of my PRs ran into a problem with the encounter menu not displaying correctly. I did not see a particularly simple problem and fixing the encounter menu was already on my list of things to do so I went ahead and started working on it. Few things left to work out, but it will hopefully make managing an encounter easier. Branch encounter-menu