Updated the window and controller to display the correct info, also added a couple of tests to card