New Design and Enhanced JS