changing ids to numbnerical
refactoring id for divs
resolved merged conflict in js