Cleaning

Fixed up divs, added a few ids/roles