Code reduced, JS and performance improved, jquery updated