Fixed duplicate files
Client side stuff