refactored HTML id names, client is fully working