Add type to players
Clean up how UI works