Fixed JS error from merging, fixed standalone page