moved js and completed jsp