more js completed; changed template to reflect js