deleted of div's and br's
fixing merge conflict and new styling