Color fixes and jquery simplifications