cleaned up JS & fixed bad color