Playing around with javascript errors
Fixing conflics