reverted changes + added js show first