Still attempting to fix Javascript issues