moved js to bottom and other tweaks