Cleaned up JS & CSS