minor changes, divs to spans etc