looks better & js bug fix