moved js and added features