changed some <div>s to <span>s and cleaned up