Added the layout of the end game popup
Fixed conflicts