Major changes to button handling, work towards getting everything
visible including infections. More refactoring as well as formatting