made gui changes everywhere, especially game page
fixed merge
removed swp files