Fix routing for games and move some buttons around