added new divs
manually merged changes to js imports