add divs to html
formatting and add shake
fix merge conlix